Merge branch 'zx_saas_goods' of http://git.dayaedu.com/yonge/mec into zx_saas_goods

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

@@ -257,7 +257,10 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         if (musicGroup.getStatus() != MusicGroupStatusEnum.PROGRESS) {
             List<MusicGroupPaymentCalender> list = musicGroupPaymentCalenderDao.findByMusicGroupId(musicGroupId);
             if (list.size() > 0) {
-                throw new BizException("创建失败，已经存在缴费信息");
+                //排除商品采购
+                if(list.stream().anyMatch(e -> e.getPaymentType() != GOODS_PURCHASE)){
+                    throw new BizException("创建失败，已经存在缴费信息");
+                }
             }
         }
         //进行中加学员拓展信息
@@ -1515,9 +1518,9 @@ public class MusicGroupPaymentCalenderServiceImpl extends BaseServiceImpl<Long,
         //商品采购订单
         if(calender.getPaymentType() == GOODS_PURCHASE && address != null){
             //关闭商城订单
-            boolean b = mallFeignService.productUpdateOrderStatus(address.getOrderNo(), 4);
-            if (!b) {
-                throw new BizException("操作失败：关闭商城订单失败");
+            CommonResult<Boolean> result = mallFeignService.productUpdateOrderStatus(address.getOrderNo(), 4);
+            if (result.getCode() != 200) {
+                throw new BizException("操作失败：关闭商城订单失败",result.getMessage());
             }
         }
     }

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

@@ -1436,6 +1436,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 }
             }
             sellOrderService.batchInsert(sellOrderList);
+            sellOrderService.syncSellOrder2Mall(sellOrderList,orderByOrderNo);
         }
     }
 

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

@@ -1433,6 +1433,7 @@ public class SubjectChangeServiceImpl extends BaseServiceImpl<Integer, SubjectCh
                 }
             }
             sellOrderService.batchInsert(sellOrderList);
+            sellOrderService.syncSellOrder2Mall(sellOrderList,order);
         }
         return sellOrderList;
     }