zoujiajian vor 1 Jahr
Ursprung
Commit
91323c69b8

+ 3 - 1
netflix-service/src/main/java/com/cyksj/service/exchange/impl/ExchangeCodeServiceImpl.java

@@ -425,7 +425,9 @@ public class ExchangeCodeServiceImpl extends ServiceImpl<ExchangeCodeMapper, Exc
 				relation.setStatus(GroupsRelation.Status.validity);
 			}
 			relation.setYhsId(yhsId);
-			relation.setCmt(1);
+			if (yhsId != null && yhsId != 0) {
+				relation.setCmt(1);
+			}
 			groupsRelationMapper.updateById(relation);
 
 			Long skuId = sku.getId();

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

@@ -370,11 +370,11 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 		if (payRequest.getCmt() == 1) {
 			yhsId = yhShopFrontService.checkShopCustomIdAndReturnShopId(customId);
 		} else if (payRequest.getCmt() == 2) {
-			userMirrorShop = userMirrorShopMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShop.class)
-					.eq(UserMirrorShop::getCustomId, customId)
-					.last("limit 1"));
-			if (!userMirrorShop.getStatus()) {
-				throw BusinessRuntimeException.getInstance("店铺已关闭");
+			if (StrUtil.isNotEmpty(customId)) {
+				userMirrorShop = userMirrorShopMapper.selectOne(Wrappers.lambdaQuery(UserMirrorShop.class).eq(UserMirrorShop::getCustomId, customId).last("limit 1"));
+				if (userMirrorShop == null || !userMirrorShop.getStatus()) {
+					throw BusinessRuntimeException.getInstance("店铺已关闭");
+				}
 			}
 		}
 		if (CollUtil.isNotEmpty(giftCards)) {