fix 去掉mj6人月付特殊价格买入

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

@@ -458,21 +458,21 @@ public class OrderDonServiceImpl extends ServiceImpl<OrderDonMapper, OrderDon> i
 			payRequest.setDonMoney(sku.getPrice());
 		}
 
-		//如 mj标准6人月付 价格特殊处理
-		if (Constant.SPECIAL_PRICE_SKU_IDS.contains(sku.getId())) {
-			UserDistributeShared distributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class)
-					.eq(UserDistributeShared::getUserId, userId)
-					.last("limit 1"));
-			if (distributeShared != null) {
-				SysConfig one = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
-						.eq(SysConfig::getSysKey, Constant.MJ_SPECIAL_SKU_PRICE_KEY)
-						.last("limit 1"));
-				if (one != null && StrUtil.isNotBlank(one.getSysValue())) {
-					GoodsDonPriceDto goodsDonPriceDto = Jsons.parseObject(one.getSysValue(), GoodsDonPriceDto.class);
-					payRequest.setDonMoney(goodsDonPriceDto.getPrice());
-				}
-			}
-		}
+//		//如 mj标准6人月付 价格特殊处理
+//		if (Constant.SPECIAL_PRICE_SKU_IDS.contains(sku.getId())) {
+//			UserDistributeShared distributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class)
+//					.eq(UserDistributeShared::getUserId, userId)
+//					.last("limit 1"));
+//			if (distributeShared != null) {
+//				SysConfig one = sysConfigService.getOne(Wrappers.lambdaQuery(SysConfig.class)
+//						.eq(SysConfig::getSysKey, Constant.MJ_SPECIAL_SKU_PRICE_KEY)
+//						.last("limit 1"));
+//				if (one != null && StrUtil.isNotBlank(one.getSysValue())) {
+//					GoodsDonPriceDto goodsDonPriceDto = Jsons.parseObject(one.getSysValue(), GoodsDonPriceDto.class);
+//					payRequest.setDonMoney(goodsDonPriceDto.getPrice());
+//				}
+//			}
+//		}
 
 		//租赁商品
 		if (goodsDon.getType() == 4) {

netflix-web/src/main/java/com/cyksj/web/controller/goods/GoodsDonController.java

@@ -21,7 +21,6 @@ import com.cyksj.mapper.RegisterOrderDonMapper;
 import com.cyksj.mapper.manage.distribute.UserDistributeSharedMapper;
 import com.cyksj.mapper.shop.YhShopGoodsSkuMapper;
 import com.cyksj.mapper.sys.SysConfigMapper;
-import com.cyksj.model.dto.GoodsDonPriceDto;
 import com.cyksj.model.entity.*;
 import com.cyksj.model.request.ClickRecordReq;
 import com.cyksj.model.views.*;
@@ -423,24 +422,24 @@ public class GoodsDonController {
 					}
 				}
 			}
-			if (fUid != null && Constant.SPECIAL_PRICE_SKU_IDS.contains(sku.getId())) {
-				UserDistributeShared distributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class)
-						.eq(UserDistributeShared::getUserId, fUid)
-						.last("limit 1"));
-				if (distributeShared != null) {
-					Optional.ofNullable(sysConfigMapper.selectOne(Wrappers.lambdaQuery(SysConfig.class)
-							.eq(SysConfig::getSysKey, Constant.MJ_SPECIAL_SKU_PRICE_KEY)
-							.last("limit 1"))).ifPresent(sysConfig -> {
-						if (StrUtil.isNotBlank(sysConfig.getSysValue())) {
-							try {
-								GoodsDonPriceDto goodsDonPriceDto = Jsons.parseObject(sysConfig.getSysValue(), GoodsDonPriceDto.class);
-								sku.setPrice(goodsDonPriceDto.getPrice());
-							} catch (Exception e) {
-							}
-						}
-					});
-				}
-			}
+//			if (fUid != null && Constant.SPECIAL_PRICE_SKU_IDS.contains(sku.getId())) {
+//				UserDistributeShared distributeShared = userDistributeSharedMapper.selectOne(Wrappers.lambdaQuery(UserDistributeShared.class)
+//						.eq(UserDistributeShared::getUserId, fUid)
+//						.last("limit 1"));
+//				if (distributeShared != null) {
+//					Optional.ofNullable(sysConfigMapper.selectOne(Wrappers.lambdaQuery(SysConfig.class)
+//							.eq(SysConfig::getSysKey, Constant.MJ_SPECIAL_SKU_PRICE_KEY)
+//							.last("limit 1"))).ifPresent(sysConfig -> {
+//						if (StrUtil.isNotBlank(sysConfig.getSysValue())) {
+//							try {
+//								GoodsDonPriceDto goodsDonPriceDto = Jsons.parseObject(sysConfig.getSysValue(), GoodsDonPriceDto.class);
+//								sku.setPrice(goodsDonPriceDto.getPrice());
+//							} catch (Exception e) {
+//							}
+//						}
+//					});
+//				}
+//			}
 			return true;
 		}).collect(Collectors.toList()));
 		return GatewayResponse.SUCCESS.newBuilder().toResult(views);