bugfix

src/main/java/com/caimei/modules/order/entity/SplitAccountPo.java

@@ -218,4 +218,27 @@ public class SplitAccountPo implements Serializable {
     public void setSplitTime(Date splitTime) {
         this.splitTime = splitTime;
     }
+
+    @Override
+    public String toString() {
+        return "SplitAccountPo{" +
+                "id=" + id +
+                ", orderId=" + orderId +
+                ", shopOrderId=" + shopOrderId +
+                ", productId=" + productId +
+                ", orderProductId=" + orderProductId +
+                ", shopId=" + shopId +
+                ", vipRecordId=" + vipRecordId +
+                ", couponRecordId=" + couponRecordId +
+                ", authVipRecordId=" + authVipRecordId +
+                ", type=" + type +
+                ", subUserNo='" + subUserNo + '\'' +
+                ", splitAccount=" + splitAccount +
+                ", mbOrderId='" + mbOrderId + '\'' +
+                ", orderRequestNo='" + orderRequestNo + '\'' +
+                ", payStatus=" + payStatus +
+                ", productType=" + productType +
+                ", splitTime=" + splitTime +
+                '}';
+    }
 }

src/main/java/com/caimei/modules/order/service/CmPayShopService.java

@@ -1237,7 +1237,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         }
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(readOnly = false,rollbackFor = Exception.class)
     public void settlement(String shopOrderId, Double settleAmount) throws Exception {
         // 结算付供应商
         String format = new SimpleDateFormat("yyyy-MM-dd_HH:mm:ss.SSS").format(new Date());
@@ -1252,7 +1252,7 @@ public class CmPayShopService extends CrudService<CmPayShopDao, CmPayShop> {
         }
     }
 
-    @Transactional(readOnly = false)
+    @Transactional(readOnly = false,rollbackFor = Exception.class)
     public void settleOrder(String P2_orderId, Double settleAmount, String P3_customerNumber, String shopOrderId, Integer settleFlag) throws Exception {
         //子订单id，结算金额
         Map<String, String> sPara = new HashMap<String, String>();

src/main/java/com/caimei/modules/order/service/SplitAccountService.java

@@ -36,7 +36,7 @@ public class SplitAccountService extends BaseService {
     @Resource
     private RedisService redisService;
 
-    @Transactional(readOnly = false)
+    @Transactional(readOnly = false,rollbackFor = Exception.class)
     public void SplitAccount() {
         logger.info("【手动分账开始】>>>>>>>>>>手动分账");
         Calendar calendar = Calendar.getInstance();
@@ -244,7 +244,7 @@ public class SplitAccountService extends BaseService {
     }
 
 
-    private List<SplitAccountPo> setSplitAccountDetail(ShopOrderVo shopOrder, PayParamBo payParam) {
+    public List<SplitAccountPo> setSplitAccountDetail(ShopOrderVo shopOrder, PayParamBo payParam) {
         List<SplitAccountPo> list = new ArrayList<>();
         // 本次支付金额,单位/元
         double payAmount = payParam.getAllPay();

src/main/webapp/WEB-INF/views/modules/order/cmSettlementForm.jsp

@@ -801,7 +801,6 @@
         });
 
         $('.pay-table').each(function () {
-            debugger
             var thisEle = $(this),
                 totalComissionVal = 0,
                 resVal = '';