Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-23 acad524bfb7f376c09ff8e6600fab207780156e1

 cloud-server-activity/src/main/java/com/dsh/activity/service/impl/UserCouponServiceImpl.java

@@ -5,6 +5,7 @@
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.feignclient.account.AppUserClient;
@@ -16,6 +17,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;
@@ -63,6 +65,9 @@
    private CouponMapper couponMapper;

    @Resource
    private CouponCityMapper couponCityMapper;

    @Resource
    private StoreClient storeClient;

    @Resource
@@ -101,16 +106,19 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
                couponListVo.setUseCondition("满￥" + num1 + "元可用");
                couponListVo.setFavorable(jsonObject.getString("deductionAmount"));
            }
            if (type == 2) {//代金券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("deductionAmount");
                if(price.compareTo(num1) <= 0){
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("");
@@ -154,7 +162,7 @@
            if (type == 1) {//满减{"num1":1,"num2":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(price.compareTo(num1) <= 0){
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("满" + num1 + "元可用");
@@ -162,8 +170,11 @@
            }
            if (type == 2) {//代金券{"num1":1}
                JSONObject jsonObject = JSON.parseObject(content);
                Double num1 = jsonObject.getDouble("deductionAmount");
                if(price.compareTo(num1) <= 0){
                Double num1 = jsonObject.getDouble("conditionalAmount");
                if(num1==null){
                    num1=0d;
                }
                if(price.compareTo(num1) < 0){
                    continue;
                }
                couponListVo.setUseCondition("");
@@ -201,14 +212,20 @@
                            break;
                        case 2:
                            packageResp.setAvailable("指定城市可用");
                            packageResp.setCityOrStore("");
                            List<CouponCity> couponId = couponCityMapper.selectList(new QueryWrapper<CouponCity>().eq("couponId", coupon.getId()));
                            StringBuilder stringBuilder = new StringBuilder();
                            for (CouponCity couponCity : couponId) {
                                stringBuilder.append(couponCity.getCity());
                            }
                            packageResp.setCityOrStore(String.valueOf(stringBuilder));
                            break;
                        case 3:
                            packageResp.setAvailable("指定门店可用");
                            CouponStore couponStore = csMapper.selectOne(new QueryWrapper<CouponStore>()
                                    .eq("couponId",coupon.getId()));
                                    .eq("couponId",coupon.getId()).last("limit 1"));
                            StoreDetailOfCourse courseOfStore = storeClient.getCourseOfStore(couponStore.getStoreId());
                            packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
//                            packageResp.setCityOrStore(courseOfStore.getStoreName()+","+courseOfStore.getStoreAddr());
                            packageResp.setCityOrStore(courseOfStore.getStoreName());
                            break;
                        default:
                            break;