Merge branch 'feature/20210305-【C端服务端】结算页查询我的优惠券信息-lcf'

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

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

@@ -606,6 +606,10 @@ 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())) {