Merge branch 'master-chw' into dev-chw

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseOrderAcceptDetailedBiz.java

@@ -261,7 +261,6 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
                         amount=amount.subtract(acceptDetailed1.getDivisionAmount());
                     }
                 }
-                othderAccept(orderDetailDTO);
             }
         }
     }
@@ -296,6 +295,7 @@ public class BaseOrderAcceptDetailedBiz extends BaseBiz<BaseOrderAcceptDetailedM
             if (acceptAmount.compareTo(BigDecimal.ZERO) > 0){
                 payOrderFAccept(orderWaterDTO,orderDetailDTO);
             }
+            othderAccept(orderDetailDTO);
             log.info("订单完成分账----finishOrderWater--------orderId===" + orderId + "----amount====" + amount + "--orderType===" + orderType);
         }