productDev/dingyuannongji.git

			@@ -16,8 +16,14 @@
			</el-form-item>
			<el-form-item label="消费类型" prop="objType">
			<el-select v-model="searchForm.objType" placeholder="请选择消费类型" @change="search" >
			<el-option :key="0" :value="0" label="获得"></el-option>
			<el-option :key="1" :value="1" label="扣除"></el-option>
			<el-option :key="0" :value="0" label="注册成功"></el-option>
			<el-option :key="3" :value="3" label="邀请好友得积分"></el-option>
			<el-option :key="12" :value="12" label="积分发放"></el-option>
			<el-option :key="13" :value="13" label="积分扣除"></el-option>
			<el-option :key="9" :value="9" label="下单抵扣"></el-option>
			<el-option :key="14" :value="14" label="取消订单退回"></el-option>
			<el-option :key="15" :value="15" label="消费返积分"></el-option>
			<el-option :key="18" :value="18" label="积分过期"></el-option>
			</el-select>
			</el-form-item>
			<div class="date-style" style="display: inline">

			@@ -856,16 +856,27 @@
			* 积分类型
			*/
			public enum IntegralObjType {
			REGISTER(0, "注册成功", "平台注册",0,0),
			INVITENEWUSER(3, "邀请好友得积分", "邀请好友得积分",0,0),
			SYSTEM_RECHARGE(12,"积分发放","积分发放",0,0),
			SYSTEM_DEDUCT(13,"积分扣除","积分扣除",0,0),
			SHOP_ORDER_CANCEL(14,"取消订单退回","取消订单退回",0,0),
			SHOP_ORDER(9,"下单抵扣","下单抵扣",1,0),
			ORDER_DONATE(15,"订单赠送积分","订单赠送积分",0,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,"订单结算金额","订单结算金额",0,1),
			WITHDRAW_APPLY(17,"余额提现","余额提现",0,1),
			SHOP_YEAR_SETTLEMENT(18,"积分过期","积分过期",0,0),
			WITHDRAW_APPLY(17,"提现","提现",0,1),
			WITHDRAW_APPLY_BACK(19,"提现取消","余额提现取消退回",0,1),
			ORDER_DONE_AMOUNT_BACK(20,"订单结算退回","订单结算退回退回",0,1),


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


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

	admin/src/views/business/integral.vue	10 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	server/dmmall_service/src/main/java/com/doumee/core/utils/Constants.java	29 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史