会员修改

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

@@ -1,6 +1,6 @@
 <template>
 	<xn-form-container
-		:title="formData.id ? '增加会员' : '增加会员'"
+		:title="formData.id ? '编辑会员' : '增加会员'"
 		:width="700"
 		v-model:open="open"
 		:destroy-on-close="true"
@@ -13,10 +13,10 @@
 			<a-form-item label="手机号：" name="phone">
 				<a-input v-model:value="formData.phone" placeholder="请输入手机号" allow-clear @blur="onBlur"/>
 			</a-form-item>
-			<a-form-item label="糕点：" name="accountBalance">
+			<a-form-item label="糕点：" name="accountBalance" v-if="formData.id==null || formData.id==''">
 				<a-input-number v-model:value="formData.accountBalance" placeholder="请输入糕点" allow-clear :min="0" :max="99999999" style="width:100%"/>
 			</a-form-item>
-			<a-form-item label="积分：" name="voucherBalance">
+			<a-form-item label="积分：" name="voucherBalance" v-if="formData.id==null || formData.id==''">
 				<a-input-number v-model:value="formData.voucherBalance" placeholder="请输入积分" allow-clear :min="0" :max="99999999" style="width:100%"/>
 			</a-form-item>
 		</a-form>

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

@@ -69,6 +69,8 @@
 <!--					<span v-else>{{ $TOOL.dictTypeData('COMMON_STATUS', record.userStatus) }}</span>-->
 				</template>
 				<template v-if="column.dataIndex === 'action'">
+					<a @click="addUserRef.onOpen(record)" v-if="hasPerm('customerEdit')">编辑</a>
+					<a-divider type="vertical" v-if="hasPerm('customerEdit') "/>
 					<a @click="formRef.onOpen(record)" v-if="hasPerm('bizUserEdit') && record.userStatus == 'ENABLE'">余额调整</a>
 					<a-divider type="vertical" v-if="hasPerm('bizUserConsumption') && record.userStatus == 'ENABLE'"/>
 					<a @click="consumptionRef.onOpen(record)" v-if="hasPerm('bizUserConsumption') && record.userStatus == 'ENABLE'">消费结算</a>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/mapper/mapping/BizUserMapper.xml

@@ -15,7 +15,8 @@
             VOUCHER_BALANCE,
             CREATE_TIME,
             USER_STATUS,
-            PHONE
+            PHONE,
+            ORG_ID
         FROM SYS_USER
         ${ew.customSqlSegment}
     </select>

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/param/BizUserEditParam.java

@@ -17,6 +17,8 @@ import jakarta.validation.constraints.NotBlank;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * 人员编辑参数
  *
@@ -49,7 +51,7 @@ public class BizUserEditParam {
 
     /** 岗位id */
     @Schema(description = "岗位id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotBlank(message = "positionId不能为空")
+    /*@NotBlank(message = "positionId不能为空")*/
     private String positionId;
 
     /** 岗级 */
@@ -179,4 +181,10 @@ public class BizUserEditParam {
     /** 扩展信息 */
     @Schema(description = "扩展信息")
     private String extJson;
+
+    /**糕点（账户余额）*/
+    private BigDecimal accountBalance;
+
+    /**积分（代金券积分）*/
+    private BigDecimal voucherBalance;
 }

snowy-plugin/snowy-plugin-biz/src/main/java/vip/xiaonuo/biz/modular/user/result/BizMemberUserResult.java

@@ -93,4 +93,7 @@ public class BizMemberUserResult extends CommonEntity {
     /**退款次数*/
     private String count;
 
+    /**门店id*/
+    private String orgId;
+
 }