合并

MrShi

18 小时以前 e4f9739d74323aacf09d139700f22a383910ee97

 server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java

@@ -2,6 +2,8 @@

import cn.binarywang.wx.miniapp.bean.WxMaCodeLineColor;
import com.doumee.core.wx.WxMiniConfig;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.business.model.MemberCoupon;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;

@@ -81,9 +83,7 @@
    public static final String INITIAL_PASSWORD = "INITIAL_PASSWORD";
    public static final String ACCESS_TOKEN = "ACCESS_TOKEN";

    public static final String MINIMUM_AVAILABLE_INTEGRAL = "MINIMUM_AVAILABLE_INTEGRAL";//最低可用积分配置
    public static final String SHOP_CONFIG = "SHOP_CONFIG";
    public static final String INTEGRAL_EXCHANGE_CASH_RATA = "INTEGRAL_EXCHANGE_CASH_RATA"; //积分-现金兑换比例（XXX积分抵扣1元）


    public static final String CASH_EXCHANGE_INTEGRAL_RATA = "CASH_EXCHANGE_INTEGRAL_RATA";//现金-积分兑换比例（1元可得到XXX积分）
@@ -168,6 +168,7 @@
        public static final String ACTIVITY_SIGN_KEY = "actcode_";
        public static final String AFTERSALE_KEY = "salecode_";
        public static final String WITHDRAW_KEY = "withdraw_";
        public static final String EXCHANGE_KEY = "exchange_";
    }
    /**
     * 企业数据来源 0平台注册 1后台导入
@@ -868,10 +869,9 @@


        EXPIRE_INTEGRAL(40,"积分过期提醒",3,0,"积分即将过期","您有{param}积分即将过期"),
        EXPIRE_COUPON(41,"优惠券发放",3,0,"优惠券发放","您有{param}张优惠券将在{param2}过期"),
        EXPIRE_COUPON(41,"优惠券过期提醒",3,0,"优惠券过期提醒","您有{param}张优惠券将在{param1}过期"),

        COMMENT(50,"社区消息",4,1,"收到评论","{param}回复了您的评论"),

        ;

        private Integer key;
@@ -959,7 +959,7 @@
        MEMBER_ORDER_REFUND(28,"订单退款","订单退款，返还订单消耗${param}积分",0,0),
        MEMBER_ORDER(9,"下单抵扣","消费抵扣，消耗${param}积分",1,0),
        ORDER_DONATE(15,"消费返积分","购物成功，获得${param}积分",0,0),
        SHOP_YEAR_SETTLEMENT(18,"积分过期","积分过期，消耗${param}积分",0,0),
        MEMBER_YEAR_SETTLEMENT(18,"积分过期","积分过期，消耗${param}积分",0,0),
        MEMBER_ORDER_REFUND_RETURN(27,"订单退款","订单退款，扣除订单返还${param}积分",0,0),


@@ -1434,6 +1434,15 @@
    }


    public static String getCouponInfo(MemberCoupon mc, Integer num){
        String info = Constants.equalsInteger(mc.getCouponType(),Constants.ZERO)?
                "满"+mc.getLimitPrice()+"元减"+mc.getPrice()+"元抵扣券*"+num:
                "满"+mc.getLimitPrice()+"元享"+mc.getPrice()+"折券*"+num;
        return info;
    }