add 教务端增加添加维修

mec-biz/src/main/java/com/ym/mec/biz/service/StudentRepairService.java

@@ -48,9 +48,9 @@ public interface StudentRepairService extends BaseService<Integer, StudentRepair
     StudentRepair getRepairInfo(Integer id);
 
     /**
-     * 更新维修单
+     * 支付维修单
      * @param repairInfo
      * @return
      */
-    Map updateRepair(StudentRepair repairInfo) throws Exception;
+    Map payRepair(StudentRepair repairInfo) throws Exception;
 }

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

@@ -195,38 +195,43 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Map updateRepair(StudentRepair repairInfo) throws Exception {
+    public Map payRepair(StudentRepair repairInfo) throws Exception {
+        if(repairInfo.getSendType().equals(1) &&
+                (repairInfo.getContactName() ==null ||repairInfo.getContactName().isEmpty()) &&
+                (repairInfo.getContactMobile() ==null ||repairInfo.getContactMobile().isEmpty()) &&
+                (repairInfo.getAddress() ==null ||repairInfo.getAddress().isEmpty())
+        ){
+            throw new BizException("邮寄信息必填");
+        }
         Date date = new Date();
         StudentRepair studentRepair = studentRepairDao.get(repairInfo.getId());
-        BigDecimal amount = repairInfo.getAmount();
+        BigDecimal amount = studentRepair.getAmount();
         String orderNo = idGeneratorService.generatorId("payment") + "";
-        repairInfo.setTransNo(orderNo);
-        repairInfo.setRepairStatus(0);
-        repairInfo.setPayStatus(0);
-        repairInfo.setCreateTime(date);
-        repairInfo.setUpdateTime(date);
-        studentRepairDao.insert(repairInfo);
-        if (repairInfo.getType() == 1) {
-            Map<String, Object> repairInfoMap = new HashMap<>();
-            MapUtil.populateMap(repairInfoMap, repairInfo);
-            return repairInfoMap;
-        }
-        repairInfo.setPayStatus(1);
+        studentRepair.setTransNo(orderNo);
+        studentRepair.setRepairStatus(0);
+        studentRepair.setPayStatus(1);
+        studentRepair.setSendType(repairInfo.getSendType());
+        studentRepair.setContactName(repairInfo.getContactName());
+        studentRepair.setContactMobile(repairInfo.getContactMobile());
+        studentRepair.setAddress(repairInfo.getAddress());
+        studentRepair.setUpdateTime(date);
+        studentRepairDao.update(repairInfo);
+
         String channelType = "";
 
         StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
-        studentPaymentOrder.setUserId(repairInfo.getStudentId());
+        studentPaymentOrder.setUserId(studentRepair.getStudentId());
         studentPaymentOrder.setGroupType(GroupType.REPAIR);
         studentPaymentOrder.setOrderNo(orderNo);
         studentPaymentOrder.setType(OrderTypeEnum.REPAIR);
         studentPaymentOrder.setExpectAmount(amount);
         studentPaymentOrder.setActualAmount(amount);
         studentPaymentOrder.setStatus(DealStatusEnum.ING);
-        studentPaymentOrder.setMusicGroupId(repairInfo.getId().toString());
+        studentPaymentOrder.setMusicGroupId(studentRepair.getId().toString());
         studentPaymentOrder.setPaymentChannel("BALANCE");
         studentPaymentOrder.setUpdateTime(date);
-        studentPaymentOrder.setOrganId(repairInfo.getOrganId());
-        studentPaymentOrder.setRoutingOrganId(repairInfo.getOrganId());
+        studentPaymentOrder.setOrganId(studentRepair.getOrganId());
+        studentPaymentOrder.setRoutingOrganId(studentRepair.getOrganId());
 
         studentPaymentOrderService.insert(studentPaymentOrder);
         studentPaymentOrder.setVersion(0);
@@ -241,7 +246,7 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
             return notifyMap;
         }
 
-        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.EDU_TEACHER_BASE_URL);
+        String baseApiUrl = sysConfigDao.findConfigValue(SysConfigService.BASE_API_URL);
 
         Map<String, BigDecimal> classFee = new HashMap<>();
         classFee.put("course", BigDecimal.ZERO);
@@ -256,9 +261,9 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 baseApiUrl + "/api-web/studentOrder/paymentResult?orderNo=" + orderNo,
                 "乐器维修",
                 "乐器维修",
-                repairInfo.getStudentId(),
+                studentRepair.getStudentId(),
                 classFee,
-                repairInfo.getOrganId()
+                studentRepair.getOrganId()
         );
 
         Map<String, BigDecimal> routingFee = (Map<String, BigDecimal>) payMap.get("routingFee");

mec-student/src/main/java/com/ym/mec/student/controller/RepairController.java

@@ -57,5 +57,15 @@ public class RepairController extends BaseController {
         return succeed(repairInfo);
     }
 
+    @ApiOperation("支付维修单")
+    @PostMapping(value = "/addRepair")
+    public HttpResponseResult payRepair(StudentRepair repairInfo) throws Exception {
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if (sysUser == null) {
+            return failed(HttpStatus.FORBIDDEN, "请登录");
+        }
+        return succeed(studentRepairService.payRepair(repairInfo));
+    }
+
 
 }