productDev/dingyuannongji.git

			@@ -1,6 +1,7 @@
			package com.doumee.core.utils;

			import com.doumee.dao.business.model.Areas;
			import io.swagger.annotations.ApiModelProperty;
			import org.apache.commons.collections4.CollectionUtils;

			import java.math.BigDecimal;
			@@ -30,8 +31,19 @@
			public static final String ORDERSET_RETURN_SHOP_INTEGRAL_STATUS="ORDERSET_RETURN_SHOP_INTEGRAL_STATUS";
			public static final String ORDERSET_RETURN_MEMBER_INTEGRAL="ORDERSET_RETURN_MEMBER_INTEGRAL";
			public static final String ORDERSET_RETURN_SHOP_INTEGRAL="ORDERSET_RETURN_SHOP_INTEGRAL";

			public static final String INTERALSET_DEDUCTINTEGRALLIMIT="INTERALSET_DEDUCTINTEGRALLIMIT";
			public static final String INTERALSET_MININTEGRALPRICELIMIT="INTERALSET_MININTEGRALPRICELIMIT";
			public static final String INTERALSET_INTEGRALINVALIDTYPE="INTERALSET_INTEGRALINVALIDTYPE";
			public static final String INTERALSET_INTEGRALINVALIDCIRCLE="INTERALSET_INTEGRALINVALIDCIRCLE";
			public static final String INTERALSET_INTEGRALRULEINFO="INTERALSET_INTEGRALRULEINFO";

			public static final String ORDERSET_TOTAL_RATE="ORDERSET_TOTAL_RATE";
			public static final String ORDER_SET ="ORDER_SET" ;
			public static final String INTEGRAL_SET ="INTEGRAL_SET" ;

			public static final String MEMBER_PREFIX = "member_";
			public static final String SHOP_PREFIX = "shop_";

			/**
			* mq tag
			@@ -63,6 +75,8 @@


			public static final String CASH_EXCHANGE_INTEGRAL_RATA = "CASH_EXCHANGE_INTEGRAL_RATA";//现金-积分兑换比例（1元可得到XXX积分）




			public static final String INITIAL_ROLE = "INITIAL_ROLE";
			@@ -117,11 +131,14 @@

			public static final String COFFEE_ARTICLE_BACKGROUND = "COFFEE_ARTICLE_BACKGROUND";

			public static final String TRANSFER_FILE = "TRANSFER_FILE";


			public interface RedisKeys {
			public static final String GOODSORDER_KEY = "ordercode_";
			public static final String ACTIVITY_SIGN_KEY = "actcode_";
			public static final String AFTERSALE_KEY = "salecode_";
			public static final String WITHDRAW_KEY = "withdraw_";
			}
			/**
			* 企业数据来源 0平台注册 1后台导入
			@@ -315,6 +332,7 @@
			SHOP_PICTURE(7, "商家图片多图", "商家图片多图"),
			AFTERSALE_APPLY(8, "申请售后补充说明附件", "申请售后补充说明附件"),
			AFTERSALE_KD(9, "申请售后邮寄说明附件", "申请售后邮寄说明附件"),
			TRANSFER_FILE(10, "打款凭证", "打款凭证"),
			;
			// 成员变量
			private String name;
			@@ -847,15 +865,22 @@
			SHARE_INFO(6,"分享资讯","分享资讯",0),
			POST_COMMENTS(7,"发布评论","发布评论",0),
			COFFEE_MAP_CONSUME(8,"咖啡地图消费","咖啡地图消费",0),
			SHOP_ORDER(9,"余额抵扣商品","余额抵扣商品",1),
			SHOP_ORDER(9,"积分抵扣商品","积分抵扣商品",1),
			AFTERSALE_BACK(10,"售后退款","售后退款",1),
			EXCHANGE_CARD(11,"卡充值","卡充值",0),
			SYSTEM_RECHARGE(12,"平台充值","平台充值",0),
			SYSTEM_DEDUCT(13,"平台扣款","平台扣款",0),
			SHOP_ORDER_CANCEL(14,"余额抵扣商品退还","余额抵扣商品退还",0),
			SHOP_ORDER_SETTLEMENT(15,"下单结算金额","下单结算金额",0), //经销商下单结算金额
			SHOP_ORDER_CANCEL_SETTLEMENT(16,"取消订单结算金额返还","取消订单结算金额返还",0), //取消订单结算金额返还
			SHOP_YEAR_SETTLEMENT(17,"年度结算","年度结算",0) //年度结算
			SHOP_ORDER_CANCEL(14,"积分抵扣商品退还","积分抵扣商品退还",0),
			ORDER_DONATE(15,"订单赠送积分","订单赠送积分",0),
			ORDER_DONE_AMOUNT(16,"订单结算金额","订单结算金额",0),

			WITHDRAW_APPLY(17,"余额提现","余额提现",0), //经销商下单结算金额




			SHOP_ORDER_CANCEL_SETTLEMENT(17,"取消订单结算金额返还","取消订单结算金额返还",0), //取消订单结算金额返还
			SHOP_YEAR_SETTLEMENT(18,"年度结算","年度结算",0) //年度结算
			;
			// 成员变量
			private String name;
			@@ -945,6 +970,8 @@
			BIG_AREA(13, "区域分类", "区域分类"),
			APPLICABLE_BRAND(14, "适用品牌", "适用品牌"),
			SERIES_BRAND(15, "品牌系列", "品牌系列"),
			YUN_FEE(16, "运费配置", "运费配置"),
			EXPRESS_DELIVERY(17, "快递信息", "快递信息"),
			;
			// 成员变量
			private String name;
			@@ -1129,5 +1156,52 @@
			}
			}

			public enum UserActionType {
			CHANGE_SHOP(0, "经销商更换","由【${param1}】于【${param2}】，进行【经销商更换】" ),
			;

			// 成员变量
			private int key;
			private String name;
			private String info;

			// 构造方法
			UserActionType(int key, String name,String info ) {
			this.key = key;
			this.info = info;
			this.name = name;
			}
			public static String getName(int index) {
			for (UserActionType c : UserActionType.values()) {
			if (c.getKey() == index) {
			return c.name;
			}
			}
			return null;
			}

			public int getKey() {
			return key;
			}

			public void setKey(int key) {
			this.key = key;
			}

			public String getName() {
			return name;
			}

			public void setName(String name) {
			this.name = name;
			}

			public String getInfo() {
			return info;
			}

			public void setInfo(String info) {
			this.info = info;
			}
			}
			}