productDev/dingyuannongji.git

			@@ -77,6 +77,11 @@
			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";
			@@ -856,44 +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),
			ORDER_DONATE(15,"订单赠送积分","订单赠送积分",0),
			ORDER_DONE_AMOUNT(16,"订单结算金额","订单结算金额",0),

			WITHDRAW_APPLY(17,"余额提现","余额提现",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_CANCEL_SETTLEMENT(17,"取消订单结算金额返还","取消订单结算金额返还",0), //取消订单结算金额返还
			SHOP_YEAR_SETTLEMENT(18,"年度结算","年度结算",0) //年度结算
			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;
			}

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

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

			public Integer getType() {
			return type;
			}

			// get set 方法
			@@ -1158,6 +1181,7 @@

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

			// 成员变量