增加销售收入

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.service.impl;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.ym.mec.biz.dal.dao.*;
 import com.ym.mec.biz.dal.entity.*;
 import com.ym.mec.biz.dal.enums.*;
@@ -36,6 +37,8 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
     private StudentPaymentOrderDetailDao studentPaymentOrderDetailDao;
     @Autowired
     private SporadicChargeInfoDao sporadicChargeInfoDao;
+    @Autowired
+    private StudentRepairDao studentRepairDao;
 
     @Override
     public BaseDAO<Integer, SellOrder> getDAO() {
@@ -356,9 +359,18 @@ public class SellOrderServiceImpl extends BaseServiceImpl<Integer, SellOrder> im
         }
 
         //乐器维修
-        if(order.getType().equals(OrderTypeEnum.REPAIR)){
-
-        }
+//        if(order.getType().equals(OrderTypeEnum.REPAIR)){
+//            StudentRepair repairInfo = studentRepairDao.getRepairInfo(Integer.parseInt(order.getMusicGroupId()));
+//
+//            if (StringUtils.isNotBlank(repairInfo.getGoodsJson())) {
+//                List<Goods> goods = JSONObject.parseArray(repairInfo.getGoodsJson(), Goods.class);
+//                List<Integer> goodsIds = goods.stream().map(Goods::getId).collect(Collectors.toList());
+//                if (goodsIds.size() > 0) {
+//                    addSellOrder(order.getId(), null, goodsIds, order.getExpectAmount(), order.getBalancePaymentAmount());
+//                }
+//            }
+//
+//        }
 
         //乐团报名
         if (order.getType().equals(OrderTypeEnum.APPLY)) {

mec-web/src/main/java/com/ym/mec/web/controller/SysPaymentConfigController.java

@@ -121,7 +121,7 @@ public class SysPaymentConfigController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('paymentConfig/delTypeRoute')")
     public HttpResponseResult<SysPaymentConfig> delTypeRoute(Integer id) {
         SysPaymentConfig paymentConfig = sysPaymentConfigService.get(id);
-        if (paymentConfig != null) {
+        if (paymentConfig == null) {
             return failed("此分部配置不存在");
         }
         Date nowDate = new Date();