productDev/dingyuannongji.git

			@@ -623,8 +623,7 @@
			DONE(3, "交易完成", "交易完成"),
			CLOSE(4, "已关闭", "已关闭"),
			PART_DONE(5, "部分发货", "部分发货"),


			REFUND(6, "订单退款", "订单退款"),
			;
			// 成员变量
			private String name;
			@@ -881,7 +880,7 @@
			*/
			public enum IntegralObjType {
			REGISTER(0, "注册积分奖励", "注册成功，获得${param}积分",0,0),
			INVITENEWUSER(3, "邀请好友得积分", "推荐好友${param}成功，获得${param1}积分",0,0),
			INVITENEWUSER(3, "邀请好友得积分", "推荐好友${param1}成功，获得${param}积分",0,0),
			SYSTEM_RECHARGE(12,"积分发放","平台奖励，获得${param}积分",0,0),
			SYSTEM_DEDUCT(13,"积分扣除","平台扣减，消耗${param}积分",0,0),
			MEMBER_ORDER_CANCEL(14,"取消订单退回","交易退款退回，获得${param}积分",0,0),
			@@ -890,17 +889,21 @@
			SHOP_YEAR_SETTLEMENT(18,"积分过期","积分过期，消耗${param}积分",0,0),


			ORDER_DONE_AMOUNT(16,"订单结算","${param}订单结算成功，获得￥${param1}元",0,1),//${param}订单编号，${param1}金额
			ORDER_DONE_AMOUNT(16,"订单结算","${param1}订单结算成功，获得￥${param}元",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}金额
			ORDER_DONE_AMOUNT_BACK(20,"订单结算退回","${param1}订单结算退回，消耗￥${param}元",0,1),//${param}订单编号，${param1}金额


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

			SHOP_ORDER_REFUND_CASH(25,"订单退款","订单退款，扣除结算金额${param}元",0,0),
			SHOP_ORDER_REFUND_INTEGRAL(26,"订单退款","订单退款，扣除订单返还${param}积分",0,0),
			MEMBER_ORDER_REFUND_RETURN(27,"订单退款","订单退款，扣除订单返还${param}积分",0,0),
			MEMBER_ORDER_REFUND(28,"订单退款","订单退款，返还订单消耗${param}积分",0,0),

			//----------------废弃-------start---------
			SIGNIN(1, "签到", "签到",0,0),