sdk升级

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

@@ -579,6 +579,7 @@ public class CouponServiceImpl implements CouponService {
                 activityCouponBean.setActivityCode(memberCoupon.getActivityCode());
                 activityCouponBean.setCouponType(couponStateVo.getType());
                 activityCouponBean.setDateDescribe(couponAdapter.getDateDescribe(memberCoupon.getStatus(), memberCoupon.getStartTime(), memberCoupon.getEndTime()));
+                activityCouponBean.setCouponPic(memberCoupon.getLogo());
                 if (couponStateVo.getDailyAvailableTimes() == null && couponStateVo.getAvailableTimes() != null){
                     activityCouponBean.setDailyAvailableTimes(couponStateVo.getAvailableTimes());
                 } else {
@@ -591,7 +592,6 @@ public class CouponServiceImpl implements CouponService {
                     activityCouponBean.setSelected(YesOrNoEnum.NO.getCode());
                 }
                 if (hasGoodsCoupon) {
-                    activityCouponBean.setCouponPic(memberCoupon.getLogo());
                     if (StringUtils.isNotBlank(chooseCouponCode) && chooseCouponCode.equals(activityCouponBean.getCouponCode())){
                         activityCouponBean.setSelected(YesOrNoEnum.YES.getCode());
                         usableCoupons.add(activityCouponBean);
@@ -606,13 +606,11 @@ public class CouponServiceImpl implements CouponService {
                 } else {
                     if (Objects.equals(couponStateVo.getState(), CouponStateEnum.STATE_1.getCode()) || (activityCouponBean.getDailyAvailableTimes() != null && activityCouponBean.getDailyAvailableTimes() == 0)) {
                         if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_0.getCode()) || Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_4.getCode())){
-                            activityCouponBean.setCouponPic(memberCoupon.getLogo());
                             activityCouponBean.setUnusedReason("商品券只能在点餐页");
                         }
                         disableCoupons.add(activityCouponBean);
                         disableCouponNum = disableCouponNum + 1;
                     } else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_0.getCode()) || Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_4.getCode())) {
-                        activityCouponBean.setCouponPic(memberCoupon.getLogo());
                         activityCouponBean.setUnusedReason("商品券只能在点餐页");
                         disableCoupons.add(activityCouponBean);
                         disableCouponNum = disableCouponNum + 1;