1.去掉商户入住的时候的手机验证码

2.商户结算类型添加slgns钱包

crmeb_src/mer_java/crmeb-admin/src/main/java/com/zbkj/admin/service/impl/FinanceServiceImpl.java

@@ -333,6 +333,9 @@ public class FinanceServiceImpl implements FinanceService {
                 record.setClosingBank(merchantInfo.getBankName());
                 record.setClosingBankCard(merchantInfo.getBankCard());
                 break;
+            case ClosingConstant.CLOSING_TYPE_SLGNS:
+                record.setSlgnsAddress(merchantInfo.getSlgnsAddress());
+                break;
             case ClosingConstant.CLOSING_TYPE_ALIPAY:
                 record.setAlipayAccount(merchantInfo.getAlipayCode());
                 record.setPaymentCode(merchantInfo.getAlipayQrcodeUrl());

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/constants/ClosingConstant.java

@@ -18,6 +18,8 @@ public class ClosingConstant {
 
     /** 结算提现类型：银行卡 */
     public static final String CLOSING_TYPE_BANK = "bank";
+    /** 结算提现类型：银行卡 */
+    public static final String CLOSING_TYPE_SLGNS = "slgns";
     /** 结算提现类型：支付宝 */
     public static final String CLOSING_TYPE_ALIPAY = "alipay";
     /** 结算提现类型：微信 */

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/closing/MerchantClosingRecord.java

@@ -43,7 +43,7 @@ public class MerchantClosingRecord implements Serializable {
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝")
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,slgns钱包地址")
     private String closingType;
 
     @ApiModelProperty(value = "结算姓名")
@@ -97,5 +97,6 @@ public class MerchantClosingRecord implements Serializable {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
 
-
+    @ApiModelProperty(value = "slgns钱包地址")
+    private String slgnsAddress;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/model/merchant/MerchantInfo.java

@@ -36,7 +36,7 @@ public class MerchantInfo implements Serializable {
     @ApiModelProperty(value = "商户ID")
     private Integer merId;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝")
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,slgns-钱包")
     private String settlementType;
 
     @ApiModelProperty(value = "持卡人姓名")
@@ -111,6 +111,9 @@ public class MerchantInfo implements Serializable {
     @ApiModelProperty(value = "上门服务区域范围json")
     private String serviceAreaRange;
 
+    @ApiModelProperty(value = "钱包地址")
+    private String slgnsAddress;
+
     @ApiModelProperty(value = "到店服务工单开关：0-关闭，1-开启")
     private Boolean serviceWorkOrderSwitch;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/UserClosingApplyRequest.java

@@ -35,9 +35,9 @@ public class UserClosingApplyRequest implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-    @ApiModelProperty(value = "结算方式| alipay=支付宝,bank=银行卡,wechat=微信", allowableValues = "range[alipay,weixin,bank]")
-    @NotBlank(message = "请选择结算方式， 支付宝|微信|银行卡")
-    @StringContains(limitValues = {"alipay","wechat","bank"}, message = "未知的结算方式")
+    @ApiModelProperty(value = "结算方式| alipay=支付宝,bank=银行卡,wechat=微信,slgns=sLGNS钱包", allowableValues = "range[alipay,weixin,bank,slgns]")
+    @NotBlank(message = "请选择结算方式， 支付宝|微信|银行卡|sLGNS钱包")
+    @StringContains(limitValues = {"alipay","wechat","bank","slgns"}, message = "未知的结算方式")
     private String type;
 
     @ApiModelProperty(value = "支付宝账号")
@@ -61,6 +61,9 @@ public class UserClosingApplyRequest implements Serializable {
     @ApiModelProperty(value = "提现银行名称")
     private String bankName;
 
+    @ApiModelProperty(value = "钱包地址")
+    private String slgnsAddress;
+
     @ApiModelProperty(value = "结算金额")
     @NotNull(message = "请输入结算金额")
     @DecimalMin(value = "0.01", message = "提现金额不能小于0.01")

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/merchant/MerchantClosingApplyRequest.java

@@ -33,9 +33,9 @@ public class MerchantClosingApplyRequest implements Serializable {
 
     private static final long serialVersionUID=1L;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝", required = true)
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,slgns钱包", required = true)
     @NotEmpty(message = "转账类型不能为空")
-    @StringContains(limitValues = {"bank","wechat","alipay"}, message = "未知的转账类型")
+    @StringContains(limitValues = {"bank","wechat","alipay","slgns"}, message = "未知的转账类型")
     private String closingType;
 
     @ApiModelProperty(value = "转账金额", required = true)
@@ -45,4 +45,5 @@ public class MerchantClosingApplyRequest implements Serializable {
 
     @ApiModelProperty(value = "备注")
     private String mark;
+
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/merchant/MerchantClosingSearchRequest.java

@@ -35,8 +35,8 @@ public class MerchantClosingSearchRequest implements Serializable {
     @ApiModelProperty(value = "结算单号")
     private String closingNo;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝")
-    @StringContains(limitValues = {"bank","wechat","alipay"}, message = "未知的结算类型")
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,slgns钱包")
+    @StringContains(limitValues = {"bank","wechat","alipay","slgns"}, message = "未知的结算类型")
     private String closingType;
 
     @ApiModelProperty(value = "审核状态：0-待审核，1-通过审核，2-审核失败")

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/request/merchant/MerchantSettledApplyRequest.java

@@ -68,9 +68,7 @@ public class MerchantSettledApplyRequest implements Serializable {
     @NotEmpty(message = "资质图片不能为空")
     private String qualificationPicture;
 
-    @ApiModelProperty(value = "验证码", required = true)
-    @NotEmpty(message = "验证码不能为空")
-    @Pattern(regexp = RegularConstants.VALIDATE_CODE_NUM_SIX, message = "验证码格式不正确，必须为6位数字")
+    @ApiModelProperty(value = "验证码", required = false)
     private String captcha;
 
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantClosingBaseInfoResponse.java

@@ -73,4 +73,7 @@ public class MerchantClosingBaseInfoResponse implements Serializable {
 
     @ApiModelProperty(value = "商户冻结额度")
     private BigDecimal freezeAmount;
+
+    @ApiModelProperty(value = "slgns钱包地址")
+    private String slgnsAddress;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantClosingDetailResponse.java

@@ -39,7 +39,7 @@ public class MerchantClosingDetailResponse implements Serializable {
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝")
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,slgns钱包")
     private String closingType;
 
     @ApiModelProperty(value = "结算姓名")
@@ -83,4 +83,7 @@ public class MerchantClosingDetailResponse implements Serializable {
 
     @ApiModelProperty(value = "商户备注")
     private String mark;
+
+    @ApiModelProperty(value = "slgns钱包地址")
+    private String slgnsAddress;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantClosingInfoResponse.java

@@ -39,7 +39,7 @@ public class MerchantClosingInfoResponse implements Serializable {
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝")
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,slgns钱包")
     private String closingType;
 
     @ApiModelProperty(value = "结算姓名")
@@ -95,4 +95,7 @@ public class MerchantClosingInfoResponse implements Serializable {
 
     @ApiModelProperty(value = "商户余额")
     private BigDecimal balance;
+
+    @ApiModelProperty(value = "钱包地址")
+    private String slgnsAddress;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/response/MerchantClosingPlatformPageResponse.java

@@ -39,7 +39,7 @@ public class MerchantClosingPlatformPageResponse implements Serializable {
     @ApiModelProperty(value = "金额")
     private BigDecimal amount;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝")
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,slgns钱包")
     private String closingType;
 
     @ApiModelProperty(value = "到账状态：0-未到账，1-已到账")
@@ -59,4 +59,7 @@ public class MerchantClosingPlatformPageResponse implements Serializable {
 
     @ApiModelProperty(value = "平台备注")
     private String platformMark;
+
+    @ApiModelProperty(value = "钱包地址")
+    private String slgnsAddress;
 }

crmeb_src/mer_java/crmeb-common/src/main/java/com/zbkj/common/vo/MerchantSettlementInfoVo.java

@@ -30,9 +30,9 @@ public class MerchantSettlementInfoVo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝", required = true)
+    @ApiModelProperty(value = "结算类型:bank-银行卡,wechat-微信,alipay-支付宝,sLGNS钱包", required = true)
     @NotEmpty(message = "结算类型不能为空")
-    @StringContains(limitValues = {"bank", "wechat", "alipay"}, message = "未知的转账类型")
+    @StringContains(limitValues = {"bank", "wechat", "alipay","slgns"}, message = "未知的转账类型")
     private String settlementType;
 
     @ApiModelProperty(value = "持卡人姓名")
@@ -61,4 +61,7 @@ public class MerchantSettlementInfoVo implements Serializable {
 
     @ApiModelProperty(value = "支付宝收款二维码")
     private String alipayQrcodeUrl;
+
+    @ApiModelProperty(value = "钱包地址")
+    private String slgnsAddress;
 }

crmeb_src/mer_java/crmeb-service/src/main/java/com/zbkj/service/service/impl/MerchantServiceImpl.java

@@ -705,6 +705,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantDao, Merchant> impl
         }
         MerchantInfo merchantInfo = new MerchantInfo();
         BeanUtils.copyProperties(request, merchantInfo);
+        merchantInfo.setSlgnsAddress(request.getSlgnsAddress());
         merchantInfo.setId(tempMerchantInfo.getId());
 
         if (!request.getSettlementType().equals(MerchantConstants.MERCHANT_SETTLEMENT_TYPE_BANK)) {
@@ -828,7 +829,7 @@ public class MerchantServiceImpl extends ServiceImpl<MerchantDao, Merchant> impl
             throw new CrmebException(CommonResultCode.VALIDATE_FAILED, "手机号已存在");
         }
         //检测验证码
-//        smsService.checkValidateCode(SmsConstants.VERIFICATION_CODE_SCENARIO_SETTLED, request.getPhone(), request.getCaptcha());
+        // smsService.checkValidateCode(SmsConstants.VERIFICATION_CODE_SCENARIO_SETTLED, request.getPhone(), request.getCaptcha());
 
         MerchantCategory merchantCategory = merchantCategoryService.getByIdException(request.getCategoryId());
         request.setHandlingFee(merchantCategory.getHandlingFee());

crmeb_src/mer_mer_admin/src/components/base/ZBParser.vue

@@ -75,15 +75,16 @@ export default {
       // 获取表单配置后生成table列
       this.loading = true;
       const _pram = { name: encodeURIComponent(formName) };
-      systemFormConfigApi
-        .formTempNameInfoApi(_pram)
-        .then((data) => {
-          this.formConf = JSON.parse(data.content);
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+        systemFormConfigApi
+          .formTempNameInfoApi(_pram)
+          .then((data) => {
+            this.formConf = JSON.parse(data.content);
+            this.loading = false;
+          })
+          .catch((err) => {
+            this.loading = false;
+            console.error('ZBParser Error:', err);
+          });
     },
     handlerSubmit: Debounce(function (formValue) {
       this.$emit('submit', formValue);

crmeb_src/mer_mer_admin/src/filters/accounts.js

@@ -24,10 +24,12 @@ export function transactionTypeFilter(status) {
  * 转账类型
  */
 export function transferTypeFilter(status) {
+  if (typeof status === 'string') status = status.toLowerCase();
   const statusMap = {
     bank: '银行卡',
     alipay: '支付宝',
     wechat: '微信',
+    slgns: 'sLGNS钱包',
   };
   return statusMap[status];
 }

crmeb_src/mer_mer_admin/src/utils/global_vars.js

@@ -0,0 +1,10 @@
+// 全局变量定义文件
+// 你可以在这里添加任何你需要的全局变量
+
+const globalVars = {
+    // 示例变量
+    priceUnit: 'sL',
+
+};
+
+export default globalVars;

crmeb_src/mer_mer_admin/src/views/finance/closingRecord/index.vue

@@ -167,7 +167,7 @@
             <div class="list sp100"><label class="name">银行账号：</label>{{ closingData.closingBankCard || '-' }}</div>
             <div class="list sp100"><label class="name">开户户名：</label>{{ closingData.closingName || '-' }}</div>
           </template>
-          <div class="list sp100" v-if="closingData.closingType !== 'bank'">
+          <div class="list sp100" v-if="closingData.closingType !== 'bank' && closingData.closingType !== 'slgns'">
             <label class="name">真实姓名：</label>{{ closingData.realName || '-' }}
           </div>
           <div class="list sp100" v-if="closingData.closingType === 'wechat'">
@@ -176,6 +176,9 @@
           <div class="list sp100" v-if="closingData.closingType === 'alipay'">
             <label class="name">支付宝账号：</label>{{ closingData.alipayAccount || '-' }}
           </div>
+          <div class="list sp100" v-if="closingData.closingType === 'slgns'">
+            <label class="name">钱包地址：</label>{{ closingData.slgnsAddress || '-' }}
+          </div>
           <div v-if="closingData.closingType !== 'bank' && closingData.paymentCode" class="list sp100 acea-row">
             <label class="name">收款二维码：</label>
             <div class="demo-image__preview">
@@ -247,10 +250,11 @@
                   <el-radio label="bank">银行卡</el-radio>
                   <el-radio label="wechat">微信</el-radio>
                   <el-radio label="alipay">支付宝</el-radio>
+                  <el-radio label="slgns">sLGNS钱包</el-radio>
                 </el-radio-group>
               </el-form-item>
             </div>
-            <div v-if="transferBaseInfo.settlementType !== 'bank'" class="list el-form-item el-form-item--mini sp100">
+            <div v-if="transferBaseInfo.settlementType !== 'bank' && transferBaseInfo.settlementType !== 'slgns'" class="list el-form-item el-form-item--mini sp100">
               <label class="el-form-item__label wid112">真实姓名：</label>
               <div class="el-form-item__content ml100">
                 {{ transferBaseInfo.realName || '-' }}
@@ -298,6 +302,14 @@
               </div>
             </div>
           </template>
+          <template v-else-if="transferBaseInfo.settlementType === 'slgns'">
+            <div class="list el-form-item el-form-item--mini sp100">
+              <label class="el-form-item__label wid112">钱包地址：</label>
+              <div class="el-form-item__content ml100">
+                {{ transferBaseInfo.slgnsAddress || '-' }}
+              </div>
+            </div>
+          </template>
           <template v-else>
             <div class="list el-form-item el-form-item--mini sp100">
               <label class="el-form-item__label wid112">微信账号：</label>
@@ -411,6 +423,7 @@ export default {
         { label: '银行卡', value: 'bank' },
         { label: '微信', value: 'wechat' },
         { label: '支付宝', value: 'alipay' },
+        { label: 'sLGNS钱包', value: 'slgns' },
       ],
       listLoading: false,
       tableFrom: {

crmeb_src/mer_mer_admin/src/views/systemSetting/modifyStoreInfo/index.vue

@@ -176,13 +176,13 @@
                 <el-radio label="bank">银行卡</el-radio>
                 <el-radio label="wechat">微信</el-radio>
                 <el-radio label="alipay">支付宝</el-radio>
+                <el-radio label="slgns">sLGNS钱包</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-form>
           <z-b-parser
             v-if="loginType === '3'"
             :is-create="1"
-            :form-conf="formConf"
             :edit-data="transferData"
             :form-name="formId"
             @submit="transferhandlerSubmit"
@@ -303,6 +303,9 @@ export default {
           case 'wechat':
             this.formId = '结算信息-微信';
             break;
+          case 'slgns':
+            this.formId = '商户sLGNS钱包';
+            break;
           default:
             this.formId = '结算信息-支付宝';
             break;
@@ -419,6 +422,7 @@ export default {
           wechatCode: formValue.wechatCode,
           wechatQrcodeUrl: formValue.wechatQrcodeUrl,
           realName: formValue.realName,
+          slgnsAddress: formValue.slgnsAddress,
         }).then((res) => {
           this.$message.success('操作成功');
           this.getMerchantTransfer();
@@ -452,6 +456,7 @@ export default {
     // 获取转账信息
     getMerchantTransfer() {
       merchantTransferApi().then((res) => {
+        console.log('Merchant Settlement Data:', res);
         this.transferData = res;
         this.settlementForm = res;
       });
@@ -806,4 +811,15 @@ export default {
   z-index: 11;
   opacity: 1;
 }
+
+::v-deep .el-radio__original {
+  display: block !important;
+  width: 0 !important;
+  height: 0 !important;
+  opacity: 0 !important;
+  position: absolute !important;
+  overflow: hidden !important;
+  clip: rect(0, 0, 0, 0) !important;
+  z-index: -1 !important;
+}
 </style>

crmeb_src/mer_plat_admin/src/filters/finance.js

@@ -28,6 +28,7 @@ export function closingTypeFilter(status) {
     bank: '银行卡',
     wechat: '微信',
     alipay: '支付宝',
+    slgns: 'sLGNS钱包',
   };
   return statusMap[status];
 }

crmeb_src/mer_plat_admin/src/utils/globalVars.js

@@ -0,0 +1,4 @@
+export default {
+    // 定义你的全局变量
+    priceUnit: "sL"
+}

crmeb_src/mer_plat_admin/src/views/finance/closing/merchantClosing/index.vue

@@ -205,6 +205,9 @@
             <div class="list sp100"><label class="name">银行账号：</label>{{ closingData.closingBankCard }}</div>
             <div class="list sp100"><label class="name">开户户名：</label>{{ closingData.closingName }}</div>
           </template>
+          <div v-if="closingData.closingType === 'slgns'" class="list sp100">
+            <label class="name">sLGNS钱包地址：</label>{{ closingData.slgnsAddress }}
+          </div>
           <div v-if="closingData.closingType === 'wechat'" class="list sp100">
             <label class="name">微信号：</label>{{ closingData.wechatNo }}
           </div>
@@ -214,7 +217,7 @@
           <div v-if="closingData.closingType === 'wechat' || closingData.closingType === 'alipay'" class="list sp100">
             <label class="name">真实姓名：</label>{{ closingData.realName }}
           </div>
-          <div v-if="closingData.closingType !== 'bank'" class="list sp100 acea-row">
+          <div v-if="closingData.closingType !== 'bank' && closingData.closingType !== 'slgns'" class="list sp100 acea-row">
             <label class="name">收款二维码：</label>
             <div class="demo-image__preview">
               <el-image :src="closingData.paymentCode" :preview-src-list="[closingData.paymentCode]" />
@@ -337,6 +340,7 @@ export default {
         { label: '银行卡', value: 'bank' },
         { label: '微信', value: 'wechat' },
         { label: '支付宝', value: 'alipay' },
+        { label: 'sLGNS钱包', value: 'slgns' },
       ],
       listLoading: true,
       tableFrom: {

crmeb_src/mer_uniapp/package-lock.json

@@ -0,0 +1,32 @@
+{
+  "name": "mer_uniapp",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "dependencies": {
+        "@qiun/ucharts": "^2.5.0-20230101",
+        "html5-qrcode": "^2.3.8",
+        "jsqr": "^1.4.0"
+      }
+    },
+    "node_modules/@qiun/ucharts": {
+      "version": "2.5.0-20230101",
+      "resolved": "https://registry.npmmirror.com/@qiun/ucharts/-/ucharts-2.5.0-20230101.tgz",
+      "integrity": "sha512-C7ccBgfPuGF6dxTRuMW0NPPMSCf1k/kh3I9zkRVBc5PaivudX/rPL+jd2Wty6gn5ya5L3Ob+YmYe09V5xw66Cw==",
+      "license": "Apache"
+    },
+    "node_modules/html5-qrcode": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmmirror.com/html5-qrcode/-/html5-qrcode-2.3.8.tgz",
+      "integrity": "sha512-jsr4vafJhwoLVEDW3n1KvPnCCXWaQfRng0/EEYk1vNcQGcG/htAdhJX0be8YyqMoSz7+hZvOZSTAepsabiuhiQ==",
+      "license": "Apache-2.0"
+    },
+    "node_modules/jsqr": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmmirror.com/jsqr/-/jsqr-1.4.0.tgz",
+      "integrity": "sha512-dxLob7q65Xg2DvstYkRpkYtmKm2sPJ9oFhrhmudT1dZvNFFTlroai3AWSpLey/w5vMcLBXRgOJsbXpdN9HzU/A==",
+      "license": "Apache-2.0"
+    }
+  }
+}

crmeb_src/mer_uniapp/pages/users/settled/index.vue

@@ -47,7 +47,8 @@
 
                </view>
              </view>
-<!--             <view class="item rel"
+			<!--             
+			<view class="item rel"
                    v-if="(isKey&&parseFloat(merchantData.auditStatus)>2) || (!isKey&&!merchantData.auditStatus)">
                <view class="acea-row row-middle required">
                  <text class="item-name">验证码</text>
@@ -60,6 +61,7 @@
                  </button>
                </view>
              </view> -->
+
              <view class="item">
                <view class="uni-list">
                  <view class="uni-list-cell">
@@ -494,9 +496,11 @@
 				if (!value.realName) return that.$util.Tips({
 					title: '请输入姓名'
 				});
-				if (!value.captcha) return that.$util.Tips({
-					title: '请填写验证码'
-				});
+				
+				// if (!value.captcha) return that.$util.Tips({
+				// 	title: '请填写验证码'
+				// });
+				
 				if (!value.categoryId) return that.$util.Tips({
 					title: '请选择商户分类'
 				});