fix 修改密码短信通知过滤、更换车票

netflix-dao/src/main/java/com/cyksj/model/request/ChangeRelationReq.java

@@ -25,4 +25,6 @@ public class ChangeRelationReq {
 	private Boolean isOutside;
 
 	private UserTicketClearedRecord.Source source;
+
+	private Long yhsId;
 }

netflix-service/src/main/java/com/cyksj/service/mange/group/CmsGroupServiceImpl.java

@@ -219,7 +219,7 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
                     orderDonMapper.updateById(orderDon);
                 });
             }
-            if (relation.getUserId() != 0 && isPrdEnv) {
+            if (relation.getUserId() != 0 && isPrdEnv && relation.getYhsId() == 0) {
                 //发送短信
                 smsService.sendSmsToRelationUser(relation.getUserId(), msg);
             }
@@ -350,7 +350,7 @@ public class CmsGroupServiceImpl extends ServiceImpl<GroupsMapper,GroupsTrips> i
             if (Constant.CHANGE_ACCOUNT_PWD_FILTER_GIDS.contains(goodsId)) {
                 return;
             }
-            if (relation.getUserId() != 0 && isPrd) {
+            if (relation.getUserId() != 0 && isPrd && relation.getYhsId() == 0) {
                 String msg = String.format(Constant.CHANGE_GROUPS_TRIPS_ACCOUNT, title);
                 try {
                     smsService.sendSmsToRelationUser(relation.getUserId(), msg);

netflix-service/src/main/java/com/cyksj/service/mange/impl/CmsOrderDonServiceImpl.java

@@ -396,6 +396,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
     public void changeRelation(ChangeRelationReq req) throws Exception {
         Long relationId = req.getRelationId();
         Long groupId = req.getGroupsId();
+        Long yhsId = req.getYhsId();
         UserTicketClearedRecord.Source source = req.getSource();
         if (source == null) source = UserTicketClearedRecord.Source.change_ticket;
         GroupsRelation relation = relationMapper.selectById(relationId);
@@ -472,6 +473,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         newRelation.setUserId(relation.getUserId());
         newRelation.setStartTime(relation.getStartTime());
         newRelation.setExpiryTime(relation.getExpiryTime());
+        newRelation.setYhsId(yhsId);
         newRelation.setCustomerService(relation.getCustomerService());
         if (newRelation.getStatus() != GroupsRelation.Status.outside) {
             newRelation.setStatus(GroupsRelation.Status.validity);
@@ -698,7 +700,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             }
             //若存在余额支付，退还余额
             if (orderDon.getBalance().compareTo(BigDecimal.ZERO) > 0) {
-                userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getBalance(), UserBalanceSourceRecord.Source.balance);
+                userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getBalance(), UserBalanceSourceRecord.Source.balance, orderDon.getYhsId());
             }
             try {
                 marketFrontService.subSpecificChanceNum(orderDon.getUserId(), orderDon.getId(), orderDon.getGoodsId(), orderDon.getUpdateTime());
@@ -712,7 +714,7 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
             }
             if (OrderDon.Type.BALANCE.getType().equals(refundType)) {
                 if (orderDon.getMoney().compareTo(BigDecimal.ZERO) > 0) {
-                    userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getRefundBalance(), UserBalanceSourceRecord.Source.refund);
+                    userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getRefundBalance(), UserBalanceSourceRecord.Source.refund, orderDon.getYhsId());
                 }
             } else {
                 //余额退款不需要扣除积分
@@ -923,11 +925,14 @@ public class CmsOrderDonServiceImpl extends ServiceImpl<OrderDonMapper,OrderDon>
         if (orderDon.getMoney().compareTo(BigDecimal.ZERO) == 0) {
             throw BusinessRuntimeException.getInstance("该订单是0元订单,无法补差价");
         }
+        if (Constant.noOrderAllStatus.contains(orderDon.getStatus().name())) {
+            throw BusinessRuntimeException.getInstance("订单不是已支付状态");
+        }
         BigDecimal refundBalance = orderRefundReq.getRefundBalance();
         if (refundBalance == null || refundBalance.compareTo(BigDecimal.ZERO) <= 0 || refundBalance.compareTo(orderDon.getMoney()) > 0) {
             throw BusinessRuntimeException.getInstance("请输入正确的差价金额");
         }
-        userBenefitsService.addUserBalance(orderDon.getUserId(), refundBalance, UserBalanceSourceRecord.Source.price_differ);
+        userBenefitsService.addUserBalance(orderDon.getUserId(), refundBalance, UserBalanceSourceRecord.Source.price_differ, orderDon.getYhsId());
     }
 
     /**

netflix-service/src/main/java/com/cyksj/service/market/task/impl/TaskServiceImpl.java

@@ -154,7 +154,7 @@ public class TaskServiceImpl implements TaskService {
 						if (taskView != null) {
 							if ("关注引导".equals(taskView.getTypeName()) && taskView.getBalance().compareTo(BigDecimal.ZERO) > 0) {
 								//发送余额
-								userBenefitsService.addUserBalance(dbPlatVerify.getUserId(), taskView.getBalance(), UserBalanceSourceRecord.Source.follow_task);
+								userBenefitsService.addUserBalance(dbPlatVerify.getUserId(), taskView.getBalance(), UserBalanceSourceRecord.Source.follow_task, 0l);
 								record.setBalance(taskView.getBalance());
 							}
 						}

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonCommentServiceImpl.java

@@ -64,7 +64,7 @@ public class OrderDonCommentServiceImpl implements OrderDonCommentService {
 						.eq(OrderCommentRewardConfig::getGoodsId, goodsId).last("limit 1"));
 				if (orderCommentRewardConfig != null) {
 					BigDecimal balance = orderCommentRewardConfig.getBalance();
-					userBenefitsService.addUserBalance(orderComment.getUserId(), balance, UserBalanceSourceRecord.Source.rd_comment);
+					userBenefitsService.addUserBalance(orderComment.getUserId(), balance, UserBalanceSourceRecord.Source.rd_comment, 0l);
 					log.info("审核订单:{}评价成功,发放余额:{}", orderComment.getOrderId(), balance.divide(BigDecimal.valueOf(100)));
 					orderCommentMapper.update(null, Wrappers.lambdaUpdate(OrderComment.class)
 							.set(OrderComment::getBalance, balance)

netflix-service/src/main/java/com/cyksj/service/order/impl/OrderDonServiceImpl.java

@@ -791,7 +791,7 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 				}
 				//返还余额
 				if (orderDon.getBalance().compareTo(BigDecimal.ZERO) > 0) {
-					userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getBalance(), UserBalanceSourceRecord.Source.close);
+					userBenefitsService.addUserBalance(orderDon.getUserId(), orderDon.getBalance(), UserBalanceSourceRecord.Source.close, orderDon.getYhsId());
 				}
 
 				//是否是礼品卡 现金支付订单

netflix-service/src/main/java/com/cyksj/service/scheduler/impl/SchedulerServiceImpl.java

@@ -198,7 +198,7 @@ public class SchedulerServiceImpl implements SchedulerService {
 							log.info("user_id:{},relationId:{}返回余额为0", userId, change_relationId);
 							return;
 						}
-						userBenefitsService.addUserBalance(userId, re_balance, UserBalanceSourceRecord.Source.clear_valid);
+						userBenefitsService.addUserBalance(userId, re_balance, UserBalanceSourceRecord.Source.clear_valid, relationView.getYhsId());
 						log.info("车票未到期清除,退款至用户user_id:{}余额:{}成功", userId, re_balance);
 						//修改订单状态 为退款
 						orderDon.setStatus(OrderDon.Status.refund);
@@ -220,7 +220,7 @@ public class SchedulerServiceImpl implements SchedulerService {
 						cmsOrderDonService.refundRecord(orderDon, goodsDon, sku, StrUtil.EMPTY, "balance");
 						return;
 					}
-					changeTickerRelation(item_groupsId, relationView, source);
+					changeTickerRelation(item_groupsId, relationView, source, relationView.getYhsId());
 					return;
 				}
 				//大于10天
@@ -241,16 +241,16 @@ public class SchedulerServiceImpl implements SchedulerService {
 						item_groupsId = new_relation.getGroupsId();
 					}
 					//新车队
-					changeTickerRelation(item_groupsId, relationView, UserTicketClearedRecord.Source.new_groups_ticket);
+					changeTickerRelation(item_groupsId, relationView, UserTicketClearedRecord.Source.new_groups_ticket, relationView.getYhsId());
 					return;
 				}
-				changeTickerRelation(item_groupsId, relationView, source);
+				changeTickerRelation(item_groupsId, relationView, source, relationView.getYhsId());
 				return;
 			}
 		});
 	}
 
-	public void changeTickerRelation(Long item_groupsId, GroupsRelationView relationView, UserTicketClearedRecord.Source source) {
+	public void changeTickerRelation(Long item_groupsId, GroupsRelationView relationView, UserTicketClearedRecord.Source source, Long yhsId) {
 		Long change_relationId = relationView.getId();
 		try {
 			ChangeRelationReq req = new ChangeRelationReq();
@@ -258,6 +258,7 @@ public class SchedulerServiceImpl implements SchedulerService {
 			req.setRelationId(change_relationId);
 			req.setSource(source);
 			req.setIsOutside(true);
+			req.setYhsId(yhsId);
 			cmsOrderDonService.changeRelation(req);
 		} catch (Exception e) {
 			log.error("更换用户relationId:{}错误:{}", change_relationId, StringUtil.getErrorText(e));

netflix-service/src/main/java/com/cyksj/service/template/impl/TemplateCommonServiceImpl.java

@@ -230,7 +230,7 @@ public class TemplateCommonServiceImpl implements TemplateCommonService {
 				if (Constant.CHANGE_ACCOUNT_PWD_FILTER_GIDS.contains(account.getGoodsId())) {
 					return;
 				}
-				if (relation.getUserId() != 0 && isPrdEnv) {
+				if (relation.getUserId() != 0 && isPrdEnv && relation.getYhsId() == 0) {
 					String msg = String.format(Constant.CHANGE_GROUPS_TRIPS_ACCOUNT, title);
 					smsService.sendSmsToRelationUser(relation.getUserId(), msg);
 				}

netflix-service/src/main/java/com/cyksj/service/user/UserBenefitsService.java

@@ -26,7 +26,7 @@ public interface UserBenefitsService {
 	/**
 	 * 增加用户余额
 	 */
-	void addUserBalance(Long userId, BigDecimal addBalance, UserBalanceSourceRecord.Source source);
+	void addUserBalance(Long userId, BigDecimal addBalance, UserBalanceSourceRecord.Source source, Long yhsId);
 
 	/**
 	 * 扣除用户余额

netflix-service/src/main/java/com/cyksj/service/user/impl/UserBenefitsServiceImpl.java

@@ -72,7 +72,7 @@ public class UserBenefitsServiceImpl implements UserBenefitsService {
 	}
 
 	@Override
-	public void addUserBalance(Long userId, BigDecimal addBalance, UserBalanceSourceRecord.Source source) {
+	public void addUserBalance(Long userId, BigDecimal addBalance, UserBalanceSourceRecord.Source source,Long yhsId) {
 		if (addBalance.compareTo(BigDecimal.ZERO) <= 0) {
 			return;
 		}
@@ -84,7 +84,7 @@ public class UserBenefitsServiceImpl implements UserBenefitsService {
 			if (success == 1) {
 				recordBalanceBySource(userId, addBalance, source);
 				if (envCommonService.isPrdEnv()) {
-					if (source != UserBalanceSourceRecord.Source.close && source != UserBalanceSourceRecord.Source.balance) {
+					if (source != UserBalanceSourceRecord.Source.close && source != UserBalanceSourceRecord.Source.balance && yhsId == 0) {
 						try {
 							//短信到账提醒
 							String msg = String.format(Constant.BALANCE_NOTIFY_MSG, addBalance.divide(BigDecimal.valueOf(100)));