站内信完善

ship-module-ota/ship-module-ota-biz/src/main/java/com/yc/ship/module/ota/service/distributorrecharge/DistributorRechargeServiceImpl.java

@@ -366,21 +366,6 @@ public class DistributorRechargeServiceImpl implements DistributorRechargeServic
                                 try{
                                     if (rechargeReqDTO.getStoreId() != null){
                                         isShareBalance.set(true);
-//                                        StoreReqDTO reqDTO = this.convertStorePlatBalance(rechargeReqDTO.getStoreId(), tradeMode, money, Long.parseLong(rechargeReqDTO.getOrderId()), tradeType, null);
-//                                        TenantUtils.execute(distributor.getAccountTenantId(), () -> {
-//                                            StoreInfoReqDTO storeData = storeApi.getStoreById(rechargeReqDTO.getStoreId()).getCheckedData();
-//                                            Asserts.isTrue(!ObjectUtil.equals(storeData.getBalanceType(), StoreBalanceTypeEnum.FORBIDDEN.getType()), "当前门店禁止使用预付款");
-//                                            if(ObjectUtil.equals(storeData.getBalanceType(), StoreBalanceTypeEnum.FIXED.getType())){
-//                                                //只能使用门店自己的预付款
-//                                                CommonResult<StoreRespDTO> storeResult = storeApi.storePlatTrade(reqDTO);
-//                                                Asserts.isTrue(storeResult.isSuccess(), storeResult.getMsg());
-//                                                storeRespDTO.set(storeResult.getCheckedData());
-//                                            }else if(ObjectUtil.equals(storeData.getBalanceType(), StoreBalanceTypeEnum.SHARE.getType())){
-//                                                isShareBalance.set(true);
-//                                            }else {
-//                                                Asserts.isTrue(true,"门店禁用预付款");
-//                                            }
-//                                        });
                                     }else {
                                         isShareBalance.set(true);
                                     }
@@ -405,13 +390,13 @@ public class DistributorRechargeServiceImpl implements DistributorRechargeServic
 
                                 if(!flag){
                                     //尝试授信
-                                    tradeType = DistributorTradeTypeEnum.CREDIT_TRANS.getType();
+//                                    tradeType = DistributorTradeTypeEnum.CREDIT_TRANS.getType();
                                 }
                             } else {
                                 if (!canChangeToCredit) {
                                     throw exception0(11_028, "分销商无预付款交易权限！");
                                 }
-                                tradeType = DistributorTradeTypeEnum.CREDIT_TRANS.getType();
+//                                tradeType = DistributorTradeTypeEnum.CREDIT_TRANS.getType();
                             }
 
                             if(tradeType == DistributorTradeTypeEnum.CREDIT_TRANS.getType()){
@@ -432,22 +417,6 @@ public class DistributorRechargeServiceImpl implements DistributorRechargeServic
                             afterBalance = beforeBalance.add(money);
                             AtomicBoolean isShareBalance = new AtomicBoolean(false);
                             AtomicReference<StoreRespDTO> storeRespDTO = new AtomicReference<>();
-//                            if (rechargeReqDTO.getStoreId() != null){
-//                                StoreReqDTO reqDTO = this.convertStorePlatBalance(rechargeReqDTO.getStoreId(), tradeMode, money, Long.parseLong(rechargeReqDTO.getOrderId()), tradeType, rechargeReqDTO.getRefundId());
-//                                TenantUtils.execute(distributor.getAccountTenantId(), () -> {
-//                                    StoreInfoReqDTO storeData = storeApi.getStoreById(rechargeReqDTO.getStoreId()).getCheckedData();
-//                                    if(ObjectUtil.equals(storeData.getBalanceType(), StoreBalanceTypeEnum.FIXED.getType())){
-//                                        CommonResult<StoreRespDTO> storeResult = storeApi.storePlatTrade(reqDTO);
-//                                        Asserts.isTrue(storeResult.isSuccess(), storeResult.getMsg());
-//                                        storeRespDTO.set(storeResult.getCheckedData());
-//                                    }else{
-//                                        isShareBalance.set(true);
-//                                    }
-//                                });
-//                            }else{
-//                                isShareBalance.set(true);
-//                            }
-
                             if(true){
                                 tradeName =(tradeType==10?"定向库存":"")+"余额退款金额：" + money + "元,退款到账后剩余余额" + afterBalance + "元";
                                 //操作账户资金
@@ -572,22 +541,6 @@ public class DistributorRechargeServiceImpl implements DistributorRechargeServic
                             isShareBalance = new AtomicBoolean(true);
                             storeRespDTO = new AtomicReference<>();
                             if (rechargeReqDTO.getStoreId() != null){
-//                                StoreReqDTO reqDTO = this.convertStorePlatBalance(rechargeReqDTO.getStoreId(), tradeMode, money, Long.parseLong(rechargeReqDTO.getOrderId()), tradeType, null);
-//                                TenantUtils.execute(distributor.getAccountTenantId(), () -> {
-//                                    StoreInfoReqDTO storeData = storeApi.getStoreById(rechargeReqDTO.getStoreId()).getCheckedData();
-//                                    Asserts.isTrue(!ObjectUtil.equals(storeData.getBalanceType(), StoreBalanceTypeEnum.FORBIDDEN.getType()), "当前门店禁止使用预付款");
-//                                    if(ObjectUtil.equals(storeData.getBalanceType(), StoreBalanceTypeEnum.FIXED.getType())){
-//                                        //只能使用门店自己的预付款
-//                                        CommonResult<StoreRespDTO> storeResult = storeApi.storePlatTrade(reqDTO);
-//                                        Asserts.isTrue(storeResult.isSuccess(), storeResult.getMsg());
-//                                        storeRespDTO.set(storeResult.getCheckedData());
-//                                    }else if(ObjectUtil.equals(storeData.getBalanceType(), StoreBalanceTypeEnum.SHARE.getType())){
-//                                        isShareBalance.set(true);
-//                                    }else {
-//                                        Asserts.isTrue(true,"门店禁用预付款");
-//                                    }
-//                                });
-//                            }else {
                                 isShareBalance.set(true);
                             }
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -410,9 +410,15 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
                     ShipRespDTO shipRespDTO = shipApi.queryShip(tradeOrderDO.getShipId());
                     map.put("routeName", routeRespDTO.getName());
                     map.put("boatName", shipRespDTO.getName());
+                    Date lastDate = DateUtil.offsetDay(tradeOrderDO.getTravelDate(), -7);
+                    map.put("jzTime7", DateUtil.format(lastDate, "yyyy-MM-dd"));
                     map.put("startTime", DateUtil.formatDate(tradeOrderDO.getTravelDate()));
                     NotifySendSingleToUserReqDTO reqDTO = new NotifySendSingleToUserReqDTO();
                     reqDTO.setTemplateParams(map);
+                    //尊敬的客户，您已成功预定长江行游轮（{boatName}·{orderNo}·{routeName}·开航日期：{startTime}）。
+                    // 请在既定的时限内完成付款。若需变更或取消，请参考退改规则并及时与长江行游轮计调人员[6334888]联系。
+                    //如需免费接站服务，请于${jzTime7}中午12:00前在系统中完善接站信息，逾期系统将视为自动放弃。
+                    //感谢您的配合，期待在长江行游轮与您相见！
                     reqDTO.setTemplateCode("sendmsg_cd_3");
                     reqDTO.setUserId(Long.parseLong(tradeOrderDO.getSellerId()));
                     notifyMessageSendApi.sendSingleMessageToAdmin(reqDTO);