|
@@ -91,8 +91,17 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
|
|
BigDecimal amount = repairInfo.getAmount();
|
|
BigDecimal amount = repairInfo.getAmount();
|
|
String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
String orderNo = idGeneratorService.generatorId("payment") + "";
|
|
repairInfo.setTransNo(orderNo);
|
|
repairInfo.setTransNo(orderNo);
|
|
|
|
+ repairInfo.setRepairStatus(0);
|
|
|
|
+ repairInfo.setPayStatus(0);
|
|
|
|
+ repairInfo.setCreateTime(date);
|
|
|
|
+ repairInfo.setUpdateTime(date);
|
|
studentRepairDao.insert(repairInfo);
|
|
studentRepairDao.insert(repairInfo);
|
|
-
|
|
|
|
|
|
+ if (repairInfo.getType() == 1) {
|
|
|
|
+ Map<String, Object> repairInfoMap = new HashMap<>();
|
|
|
|
+ MapUtil.populateMap(repairInfoMap, repairInfo);
|
|
|
|
+ return repairInfoMap;
|
|
|
|
+ }
|
|
|
|
+ repairInfo.setPayStatus(1);
|
|
String channelType = "";
|
|
String channelType = "";
|
|
|
|
|
|
StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
|
|
StudentPaymentOrder studentPaymentOrder = new StudentPaymentOrder();
|
|
@@ -110,10 +119,8 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
|
|
studentPaymentOrder.setRoutingOrganId(repairInfo.getOrganId());
|
|
studentPaymentOrder.setRoutingOrganId(repairInfo.getOrganId());
|
|
|
|
|
|
studentPaymentOrderService.insert(studentPaymentOrder);
|
|
studentPaymentOrderService.insert(studentPaymentOrder);
|
|
-
|
|
|
|
studentPaymentOrder.setVersion(0);
|
|
studentPaymentOrder.setVersion(0);
|
|
|
|
|
|
-
|
|
|
|
if (amount.compareTo(BigDecimal.ZERO) == 0) {
|
|
if (amount.compareTo(BigDecimal.ZERO) == 0) {
|
|
Map<String, String> notifyMap = new HashMap<>();
|
|
Map<String, String> notifyMap = new HashMap<>();
|
|
notifyMap.put("tradeState", "1");
|
|
notifyMap.put("tradeState", "1");
|