消费优化

snowy-admin-web/src/views/biz/couponrecord/index.vue

@@ -54,7 +54,7 @@
 							record.couponStatus === '0'
 								? '#87d068'
 								: record.couponStatus === '1'
-								  ? '#2db7f5b '
+								  ? '#2db7f5'
 								      : '#f50'
 						"
 					>

snowy-admin-web/src/views/biz/member/form.vue

@@ -144,7 +144,6 @@
 			icon: createVNode(ExclamationCircleOutlined),
 			content: '',
 			onOk() {
-				submitLoading.value = true
 				formRef.value
 					.validate()
 					.then(() => {

snowy-admin-web/src/views/biz/member/index.vue

@@ -151,14 +151,14 @@
 			width: 80
 		}
 	]
-	if (hasPerm(['balanceAdjustment'])) {
-		columns.push({
-			title: '操作',
-			dataIndex: 'action',
-			align: 'center',
-			width: 150
-		})
-	}
+
+	columns.push({
+		title: '操作',
+		dataIndex: 'action',
+		align: 'center',
+		width: 150
+	})
+
 	const statusData = tool.dictList('COMMON_STATUS')
 	const searchFormRef = ref()
 	const searchFormState = ref({})

snowy-admin-web/src/views/biz/rechargeplanconfig/index.vue

@@ -76,7 +76,7 @@
 						@change="editStatus(record)"
 						v-if="hasPerm('bizUserUpdataStatus')"
 					/>
-					<span v-else>{{ $TOOL.dictTypeData('COMMON_STATUS', record.userStatus) }}</span>
+					<span v-else>{{ $TOOL.dictTypeData('COMMON_STATUS', record.status) }}</span>
 				</template>
 				<template v-if="column.dataIndex === 'isAccount'">
 					<a-tag

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/consumptionrecord/entity/ConsumptionRecord.java

@@ -97,11 +97,9 @@ public class ConsumptionRecord extends CommonEntity implements TransPojo {
     private String phone;
 
     /**现账户余额*/
-    @TableField(exist = false)
     private BigDecimal newAccountBalance;
 
     /**现代金券余额*/
-    @TableField(exist = false)
     private BigDecimal newVoucherBalance;
 
     /**用户编码*/

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/consumptionrecord/mapper/mapping/ConsumptionRecordMapper.xml

@@ -18,8 +18,8 @@
             IFNULL(cr.account_balance,0) account_balance,
             cr.adjust_type,
             su.PHONE,
-            su.ACCOUNT_BALANCE newAccountBalance,
-            su.VOUCHER_BALANCE newVoucherBalance,
+            cr.new_account_balance newAccountBalance,
+            cr.new_voucher_balance newVoucherBalance,
             su.USER_REFERRAL_CODE userCode
         from biz_consumption_record cr
         left join SYS_USER su on cr.user_id = su.id

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/consumptionrecord/service/impl/ConsumptionRecordServiceImpl.java

@@ -223,6 +223,8 @@ public class ConsumptionRecordServiceImpl extends ServiceImpl<ConsumptionRecordM
         //保存消费记录
         consumptionRecord.setConsumptionOrg(StpLoginUserUtil.getLoginUser().getOrgId());
         consumptionRecord.setConsumptionTime(new Date());
+        consumptionRecord.setNewVoucherBalance(bizUser.getVoucherBalance());
+        consumptionRecord.setNewAccountBalance(bizUser.getAccountBalance());
         this.save(consumptionRecord);
         //修改账户余额
         bizUserService.updateById(bizUser);