update 分润设置

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

@@ -398,7 +398,7 @@ public class PayServiceImpl implements PayService {
             return null;
         }
 
-        Integer organId = (Integer) channel.get("organId");
+        Integer organId = Integer.parseInt(channel.get("organId").toString());
         if (checkHasMaxReceipt(organId, amount)) {
             return null;
         }
@@ -439,10 +439,12 @@ public class PayServiceImpl implements PayService {
         paymentChannelList.add(PaymentChannelEnum.ADAPAY);
 
         BigDecimal monthHasReceipt = studentPaymentRouteOrderDao.getRouteOrderAmount(organId, paymentChannelList, monthStartTime);
+        monthHasReceipt  = monthHasReceipt == null ? BigDecimal.ZERO : monthHasReceipt;
         if (amount.add(monthHasReceipt).compareTo(monthMaxReceipt) >= 0) {
             return true;
         }
         BigDecimal totalHasReceipt = studentPaymentRouteOrderDao.getRouteOrderAmount(organId, paymentChannelList, null);
+        totalHasReceipt  = totalHasReceipt == null ? BigDecimal.ZERO : totalHasReceipt;
         if (amount.add(totalHasReceipt).compareTo(totalMaxReceipt) >= 0) {
             return true;
         }

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

@@ -176,12 +176,15 @@ public class StudentOrderController extends BaseController {
         if (studentPaymentOrder == null && tenantPaymentOrder == null) {
             return failed("订单不存在");
         }
+        BigDecimal payAmount;
         if (studentPaymentOrder != null) {
             createTime = studentPaymentOrder.getCreateTime();
             merNos = studentPaymentOrder.getMerNos();
+            payAmount = studentPaymentOrder.getActualAmount();
         } else {
             createTime = tenantPaymentOrder.getCreateTime();
             merNos = tenantPaymentOrder.getMerNos();
+            payAmount = studentPaymentOrder.getActualAmount();
         }
 
         Calendar beforeTime = Calendar.getInstance();
@@ -198,7 +201,7 @@ public class StudentOrderController extends BaseController {
         paymentParams.put("app_id", ConfigInit.appId);
         paymentParams.put("order_no", orderNo);
         paymentParams.put("pay_channel", payChannel);
-        paymentParams.put("pay_amt", amount);
+        paymentParams.put("pay_amt", payAmount.setScale(2,BigDecimal.ROUND_HALF_UP));
         paymentParams.put("goods_title", orderSubject);
         paymentParams.put("goods_desc", orderBody);
         paymentParams.put("time_expire", timeExpire);