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;
			@@ -18,6 +19,31 @@
			public static final int THREE = 3 ;
			public static final int FOUR = 4 ;
			public static final String LABELS_IMG ="LABELS_IMG" ;
			public static final String ORDERSET_REG_INTEGRAL_REWARD_STATUS = "ORDERSET_REG_INTEGRAL_REWARD_STATUS";
			public static final String ORDERSET_SHARE_INTEGRAL_REWARD_STATUS="ORDERSET_SHARE_INTEGRAL_REWARD_STATUS";
			public static final String ORDERSET_REG_COUPON_REWARD_STATUS="ORDERSET_REG_COUPON_REWARD_STATUS";
			public static final String ORDERSET_SHARE_COUPON_REWARD_STATUS="ORDERSET_SHARE_COUPON_REWARD_STATUS";
			public static final String ORDERSET_REG_INTEGRAL_REWARD="ORDERSET_REG_INTEGRAL_REWARD";
			public static final String ORDERSET_SHARE_INTEGRAL_REWARD="ORDERSET_SHARE_INTEGRAL_REWARD";
			public static final String ORDERSET_REG_COUPON_REWARD_LIST="ORDERSET_REG_COUPON_REWARD_LIST";
			public static final String ORDERSET_SHARE_COUPON_REWARD_LIST="ORDERSET_SHARE_COUPON_REWARD_LIST";
			public static final String ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS="ORDERSET_RETURN_MEMBER_INTEGRAL_STATUS";
			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
			@@ -49,6 +75,13 @@


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


			public static final String MAIL_CONFIG = "MAIL_CONFIG";
			public static final String FIRST_WEIGHT = "FIRST_WEIGHT";
			public static final String CONTINUE_WEIGHT = "CONTINUE_WEIGHT";
			public static final String FIRST_FEE = "FIRST_FEE";
			public static final String CONTINUE_FEE = "CONTINUE_FEE";


			public static final String INITIAL_ROLE = "INITIAL_ROLE";
			@@ -103,11 +136,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后台导入
			@@ -301,6 +337,7 @@
			SHOP_PICTURE(7, "商家图片多图", "商家图片多图"),
			AFTERSALE_APPLY(8, "申请售后补充说明附件", "申请售后补充说明附件"),
			AFTERSALE_KD(9, "申请售后邮寄说明附件", "申请售后邮寄说明附件"),
			TRANSFER_FILE(10, "打款凭证", "打款凭证"),
			;
			// 成员变量
			private String name;
			@@ -562,7 +599,7 @@
			*/
			public enum OrderStatus{
			WAIT_PAY(0, "待支付", "待支付"),
			PAY_DONE(1, "待发货", "已支付待发货"),
			PAY_DONE(1, "待发货/待自提", "已支付待发货/待自提"),
			WAIT_RECEIVE(2, "待收货", "已发货待收货"),
			DONE(3, "交易完成", "交易完成"),
			CLOSE(4, "已关闭", "已关闭"),
			@@ -824,34 +861,54 @@
			* 积分类型
			*/
			public enum IntegralObjType {
			REGISTER(0, "平台注册", "平台注册",0),
			SIGNIN(1, "签到", "签到",0),
			SHARE(2, "分享邀请", "分享邀请",0),
			INVITENEWUSER(3, "邀请新用户", "邀请新用户",0),
			EXCHANGEGOODS(4, "兑换商品", "兑换商品",1),
			EXCHANGECOUPON(5, "兑换优惠券", "兑换优惠券",1),
			SHARE_INFO(6,"分享资讯","分享资讯",0),
			POST_COMMENTS(7,"发布评论","发布评论",0),
			COFFEE_MAP_CONSUME(8,"咖啡地图消费","咖啡地图消费",0),
			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)
			REGISTER(0, "注册积分奖励", "注册成功，获得${param}积分",0,0),
			INVITENEWUSER(3, "邀请好友得积分", "推荐好友${param}成功，获得${param1}积分",0,0),
			SYSTEM_RECHARGE(12,"积分发放","平台奖励，获得${param}积分",0,0),
			SYSTEM_DEDUCT(13,"积分扣除","平台扣减，消耗${param}积分",0,0),
			MEMBER_ORDER_CANCEL(14,"取消订单退回","交易退款退回，获得${param}积分",0,0),
			MEMBER_ORDER(9,"下单抵扣","消费抵扣，消耗${param}积分",1,0),
			ORDER_DONATE(15,"消费返积分","购物成功，获得${param}积分",0,0),
			SHOP_YEAR_SETTLEMENT(18,"积分过期","积分过期，消耗${param}积分",0,0),


			ORDER_DONE_AMOUNT(16,"订单结算","${param}订单结算成功，获得￥${param1}元",0,1),//${param}订单编号，${param1}金额
			WITHDRAW_APPLY(17,"余额提现","余额提现已提交，消耗￥${param}元",0,1),
			WITHDRAW_APPLY_BACK(19,"提现退回","余额提现失败，获得￥${param}元",0,1),
			ORDER_DONE_AMOUNT_BACK(20,"订单结算退回","${param}订单结算退回，消耗￥${param1}元",0,1),//${param}订单编号，${param1}金额


			SHOP_ORDER(21,"消费返积分","会员${param}交易成功，获得${param1}积分",0,0),//${param}昵称-手机号
			SHOP_ORDER_CANCEL(22,"订单取消退回","订单取消退回，退回${param}积分",0,0),
			SHOP_SYSTEM_RECHARGE(23,"积分发放","平台奖励，获得${param}积分",0,0),
			SHOP_SYSTEM_DEDUCT(24,"积分扣除","平台扣减，消耗${param}积分",0,0),


			//----------------废弃-------start---------
			SIGNIN(1, "签到", "签到",0,0),
			SHARE(2, "分享邀请", "分享邀请",0,0),
			EXCHANGEGOODS(4, "兑换商品", "兑换商品",1,0),
			EXCHANGECOUPON(5, "兑换优惠券", "兑换优惠券",1,0),
			SHARE_INFO(6,"分享资讯","分享资讯",0,0),
			POST_COMMENTS(7,"发布评论","发布评论",0,0),
			COFFEE_MAP_CONSUME(8,"咖啡地图消费","咖啡地图消费",0,0),
			AFTERSALE_BACK(10,"售后退款","售后退款",1,0),
			EXCHANGE_CARD(11,"卡充值","卡充值",0,0),
			//----------------废弃------end----------
			;
			// 成员变量
			private String name;
			private int key;
			private String noteinfo;// 描述
			private Integer addTitle; // 0 = 新增；1 = 不新增
			private Integer type; // 0 = 积分；1=现金

			// 构造方法
			IntegralObjType(int key, String name, String noteinfo ,Integer addTitle) {
			IntegralObjType(int key, String name, String noteinfo ,Integer addTitle,Integer type) {
			this.name = name;
			this.key = key;
			this.noteinfo = noteinfo;
			this.addTitle = addTitle;
			this.type = type;
			}

			// 普通方法
			@@ -872,6 +929,14 @@
			}
			}
			return null;
			}

			public void setType(Integer type) {
			this.type = type;
			}

			public Integer getType() {
			return type;
			}

			// get set 方法
			@@ -928,6 +993,8 @@
			BIG_AREA(13, "区域分类", "区域分类"),
			APPLICABLE_BRAND(14, "适用品牌", "适用品牌"),
			SERIES_BRAND(15, "品牌系列", "品牌系列"),
			YUN_FEE(16, "运费配置", "运费配置"),
			EXPRESS_DELIVERY(17, "快递信息", "快递信息"),
			;
			// 成员变量
			private String name;
			@@ -1112,6 +1179,53 @@
			}
			}

			public enum UserActionType {
			CHANGE_SHOP(0, "经销商更换","由【${param1}】于【${param2}】，进行【经销商更换】" ),
			CHANGE_SALETYPE(1, "经销商更换销售模式","由【${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;
			}
			}
			}