java/PlayPai.git

			@@ -4,10 +4,7 @@
			import com.alibaba.fastjson.JSONObject;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
			import com.dsh.activity.entity.Coupon;
			import com.dsh.activity.entity.CouponCity;
			import com.dsh.activity.entity.CouponStore;
			import com.dsh.activity.entity.UserCoupon;
			import com.dsh.activity.entity.*;
			import com.dsh.activity.feignclient.account.AppUserClient;
			import com.dsh.activity.feignclient.account.StudentClient;
			import com.dsh.activity.feignclient.account.model.AppUser;
			@@ -17,10 +14,7 @@
			import com.dsh.activity.feignclient.other.StoreClient;
			import com.dsh.activity.feignclient.other.model.Site;
			import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
			import com.dsh.activity.mapper.CouponCityMapper;
			import com.dsh.activity.mapper.CouponMapper;
			import com.dsh.activity.mapper.CouponStoreMapper;
			import com.dsh.activity.mapper.UserCouponMapper;
			import com.dsh.activity.mapper.*;
			import com.dsh.activity.model.ConponJsonRuleModel;
			import com.dsh.activity.model.CouponListVo;
			import com.dsh.activity.model.request.CouponPackageReq;
			@@ -54,6 +48,8 @@

			@Autowired
			private GDMapGeocodingUtil gdMapGeocodingUtil;
			@Autowired
			private PointsMerchandiseMapper pointsMerchandiseMapper;

			@Resource
			private AppUserClient appClient;
			@@ -255,6 +251,14 @@
			ruleModel.setDeductionAmount("");
			ruleModel.setExperienceName(jsonObject.getString("experienceName"));
			break;
			case 4:
			// 抵扣券
			Integer goodsId = coupon.getGoodsId();
			PointsMerchandise pointsMerchandise = pointsMerchandiseMapper.selectById(goodsId);
			ruleModel.setConditionalAmount("");
			ruleModel.setDeductionAmount("");
			ruleModel.setExperienceName(pointsMerchandise.getName());
			break;
			default:
			break;
			}