Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderMsgBiz.java

@@ -283,9 +283,11 @@ public class OrderMsgBiz {
                     if(null != orvd.getEndCompanyId() && !SYS_FALSE.equals(orvd.getEndCompanyId())) {
 
                         //新的账单 记录 OUT_ORDER_FUND 返回订单款取消订单
+                        //查询 201, "取消订单退款" 并且状态为真
                         OrderAccount orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                             setOrderId(baseOrder.getId());
                             setAccountType(AccountTypeEnum.OUT_ORDER_FUND.getCode());
+                            setAccountStatus(SYS_TRUE);
                         }});
 
                         if(BigDecimal.ZERO.equals(orderAccount.getDeductAmount())) {
@@ -422,9 +424,11 @@ public class OrderMsgBiz {
             OrderAccount orderAccount;
             if(RefundStatusEnum.RESIDUE_ILLEGAL.getCode().equals(baseOrder.getRefundStatus())) {
                 smstype = SmsTemplateDTO.REFUND_A;
+                //查询 203, "部分押金（扣除该扣除的 + 保留违章预备金）" 并且状态为真
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
                     setAccountType(AccountTypeEnum.OUT_PART_DEPOSIT.getCode());
+                    setAccountStatus(SYS_TRUE);
                 }});
 
                 OrderAccountDetail oad = JSONUtil.toBean(orderAccount.getAccountDetail(), OrderAccountDetail.class);
@@ -447,9 +451,11 @@ public class OrderMsgBiz {
                 residueAmount = orvd.getReturnPayResidue();
             }else if(RefundStatusEnum.REFUND_DEPOSIT.getCode().equals(baseOrder.getRefundStatus())){
                 smstype = SmsTemplateDTO.REFUND_B;
+                //查询 204, "剩余押金（扣除该扣除的）" 并且状态为真
                 orderAccount = orderAccountBiz.selectOne(new OrderAccount(){{
                     setOrderId(baseOrder.getId());
                     setAccountType(AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode());
+                    setAccountStatus(SYS_TRUE);
                 }});
                 originalAmount = orderAccount.getOriginalAmount();
                 violateAmount = orderAccount.getDeductAmount();