Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -105,9 +105,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
     @Transactional(rollbackFor = Exception.class)
     public Map addGoodsSellOrder(GoodsSellDto goodsSellDto) throws Exception {
         SysUser sysUser = sysUserFeignService.queryUserInfo();
-        if (sysUser == null) {
-            throw new BizException("请登录");
-        }
         Integer studentId = sysUser.getId();
         String goodsId = goodsSellDto.getGoodsId();
         if(StringUtils.isEmpty(goodsId)){
@@ -127,7 +124,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             amount.add(map.get(id));
         }
         List<Goods> goods = goodsService.findGoodsByIds(goodsId);
-//        BigDecimal amount = goods.stream().map(e -> e.getGroupPurchasePrice()).reduce(BigDecimal.ZERO, BigDecimal::add);
 
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
         studentPaymentOrder.setUserId(studentId);
@@ -141,7 +137,6 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
         studentPaymentOrder.setRoutingOrganId(student.getOrganId());
         studentPaymentOrderService.insert(studentPaymentOrder);
 
-//        Map<GoodsType, List<Goods>> collect = goods.stream().collect(Collectors.groupingBy(Goods::getType));
         Map<Integer, List<Goods>> collect = goods.stream().collect(Collectors.groupingBy(Goods::getId));
         List<StudentPaymentOrderDetail> studentPaymentOrderDetailList = new ArrayList<>();
         for (String id : goodsIds) {

mec-biz/src/main/resources/config/mybatis/GoodsMapper.xml

@@ -198,7 +198,7 @@
     </select>
     <select id="getGoodies" resultMap="Goods">
         SELECT * FROM goods WHERE id_ IN
-        <foreach collection="goodsIds" item="goodsId" open="(" close=")">
+        <foreach collection="goodsIds" item="goodsId" open="(" close=")" separator=",">
             #{goodsId}
         </foreach>
     </select>