瀏覽代碼

add web乐器维护列表

周箭河 4 年之前
父節點
當前提交
fc0ad617b0
共有 1 個文件被更改,包括 3 次插入26 次删除
  1. 3 26
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentInstrumentServiceImpl.java

+ 3 - 26
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentInstrumentServiceImpl.java

@@ -46,6 +46,8 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
     private StudentPaymentOrderService studentPaymentOrderService;
     @Autowired
     private ContractService contractService;
+    @Autowired
+    private SysUserCashAccountDetailService sysUserCashAccountDetailService;
 
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
@@ -200,7 +202,7 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
             SysUserCashAccountDetail paymentDetail = new SysUserCashAccountDetail();
             paymentDetail.setAmount(amount.negate());
             paymentDetail.setBalance(cashAccount.getBalance());
-            paymentDetail.setComment("乐器维修");
+            paymentDetail.setComment("乐保购买");
             paymentDetail.setCreateTime(nowDate);
             paymentDetail.setStatus(DealStatusEnum.SUCCESS);
             paymentDetail.setTransNo(studentPaymentOrder.getTransNo());
@@ -208,33 +210,8 @@ public class StudentInstrumentServiceImpl extends BaseServiceImpl<Long, StudentI
             paymentDetail.setUpdateTime(nowDate);
             paymentDetail.setUserId(userId);
             rechargeDetail.setChannel(studentPaymentOrder.getPaymentChannel());
-            if (studentPaymentOrder.getComAmount() != null) {
-                rechargeDetail.setComAmount(studentPaymentOrder.getComAmount().negate());
-                rechargeDetail.setPerAmount(studentPaymentOrder.getPerAmount().negate());
-            }
             sysUserCashAccountDetailService.insert(paymentDetail);
-            //生成销售订单
-            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) {
-                    sellOrderService.addSellOrder(studentPaymentOrder.getId(), null, goodsIds, studentPaymentOrder.getExpectAmount(), studentPaymentOrder.getBalancePaymentAmount());
-                }
-            }
 
-            String imContent = repairInfo.getStudentName() + "学员您好,您的乐器维修已受理,我们会尽快完成保养维修";
-
-            if (repairInfo.getType().equals(1)) { //线上
-                imContent = repairInfo.getStudentName() + "学员您好,请尽快寄送乐器至维修点,我们会尽快完成保养维修\n" +
-                        "联系人:" + repairInfo.getEmployeeName() + "(" + repairInfo.getEmployeePhone() + ")\n" +
-                        "地址:" + repairInfo.getEmployeeAddress() + "";
-
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_ONLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
-                        repairInfo.getStudentName(), repairInfo.getEmployeeName(), repairInfo.getEmployeePhone(), repairInfo.getEmployeeAddress());
-            } else {
-                sysMessageService.batchSendMessage(MessageSenderPluginContext.MessageSender.JIGUANG, MessageTypeEnum.SMS_REPAIR_OFFLINE_PAYMENT_SUCCESS, map, null, 0, "1", "STUDENT",
-                        repairInfo.getStudentName());
-            }
             sysMessageService.sendNoAuthPrivateMessage(repairInfo.getEmployeeId().toString(), userId.toString(), imContent);
             return true;
         }