|
@@ -143,7 +143,7 @@ public class SettlementOrderLogic {
|
|
|
if (!settlementOrder.getPayType().equals("LINE"))
|
|
|
wechatLogic.shareSettlementAmount(settlementOrder);
|
|
|
else{
|
|
|
- settlementOrder.setStatus("OK");
|
|
|
+ settlementOrder.setStatus("LINE");
|
|
|
settlementOrder.updateById();
|
|
|
}
|
|
|
|
|
@@ -307,7 +307,7 @@ public class SettlementOrderLogic {
|
|
|
.in(SettlementOrder::getSettlementOrderId, id)
|
|
|
.notIn(SettlementOrder::getStatus, SettlementStatusNewEnum.YC.getKey())
|
|
|
.count() > 0) {
|
|
|
- throw new RemoteServiceException("存在非异常结算得结算单");
|
|
|
+ //throw new RemoteServiceException("存在非异常结算得结算单");
|
|
|
}
|
|
|
|
|
|
settlementOrderService.lambdaUpdate()
|