Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

jsowell-admin/src/main/resources/application-pre.yml

@@ -150,7 +150,7 @@ wechat:
   #异步接收微信支付结果通知的回调地址
   callback: https://api.jsowellcloud.com/uniapp/pay/wechatPayCallback
   #异步接收微信退款结果通知的回调地址
-  refundCallback: https://api.jsowellcloud.com/uniapp/pay/wechatPayRefundCallback
+  refundCallback: https://apitest.jsowellcloud.com/uniapp/pay/wechatPayRefundCallback
   #商户证书私钥路径
   key:
     path: /usr/local/1632405339_20221125_cert/apiclient_key.pem
@@ -160,7 +160,7 @@ wechat:
 adapay:
   debugFlag: false
   prodMode: true
-  callback: http://api.jsowellcloud.com/uniapp/pay/adapayCallback
+  callback: http://apitest.jsowellcloud.com/uniapp/pay/adapayCallback
   jsowell:
     apiKey: api_live_b9bff039-0598-4491-88e7-06ca6dc7289e
     mockApiKey: api_test_15662261-8123-4b51-95d9-ad0af60eab53

jsowell-netty/src/main/java/com/jsowell/netty/service/electricbicycles/impl/YKCBusinessServiceImpl2.java

@@ -21,7 +21,7 @@ import org.springframework.stereotype.Service;
 
 @Slf4j
 @Service
-public class YKCBusinessServiceImpl implements YKCBusinessService {
+public class YKCBusinessServiceImpl2 implements YKCBusinessService {
 
     @Autowired
     private PileMsgRecordService pileMsgRecordService;

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileMerchantInfoServiceImpl.java

@@ -173,12 +173,12 @@ public class PileMerchantInfoServiceImpl implements PileMerchantInfoService {
 		int i = pileMerchantInfoMapper.insertPileMerchantInfo(pileMerchantInfo);
 
 		// 3 创建运营商管理员
-		if (StringUtils.isNotBlank(dto.getUserName())) {
+		if (StringUtils.isNotBlank(dto.getManagerPhone())) {
 			SysUser user = new SysUser();
 			user.setDeptId(deptId);
-			user.setUserName(dto.getUserName());
+			user.setUserName(dto.getManagerPhone());
-			user.setNickName(dto.getUserName() + "运营商管理员");
+			user.setNickName(dto.getMerchantName() + "-管理员");
-			user.setPassword(dto.getPassword());
+			user.setPassword("a" + dto.getManagerPhone());
 			user.setStatus(Constants.ZERO);
 			user.setPostIds(new Long[]{});
 			user.setRoleIds(new Long[]{3L});

jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileReservationInfoServiceImpl.java

@@ -108,7 +108,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
     }
 
     /**
-     * 启用预约
+     * 启用预约/开启预约/启动预约
      */
     @Override
     public void activateReserved(PileReservationDTO dto) {
@@ -141,7 +141,7 @@ public class PileReservationInfoServiceImpl implements PileReservationInfoServic
             }
             // 如果 vinCodes 的数量少于 3，用 "0" 补足
             while (vinCodes.size() < 3) {
-                vinCodes.add("0");
+                vinCodes.add("");
             }
 
             String type = StringUtils.equals(pileReservationInfo.getReservationType(), "single") ? "00" : "01";

jsowell-ui/src/views/pile/merchant/index.vue

@@ -153,7 +153,7 @@
           <!-- <el-input v-model="form.logoUrl" placeholder="" /> -->
         </el-form-item>
 
-        <el-row>
+<!--        <el-row>
           <el-divider>填入运营商管理员账号和密码，则自动创建一个该运营商的管理员账号</el-divider>
           <el-col :span="12">
             <el-form-item label="运营商管理员账号" prop="userName">
@@ -165,7 +165,7 @@
               <el-input v-model="form.password" placeholder="请输入运营商管理员密码" />
             </el-form-item>
           </el-col>
-        </el-row>
+        </el-row>-->
       </el-form>
       <el-row v-if="form.id == 35">
         <el-divider>第三方小程序登录拼接授权链接</el-divider>
@@ -295,6 +295,7 @@ export default {
             message: "请输入负责人电话号码",
             trigger: "blur",
           },
+            { pattern: /^1[3456789]\d{9}$/, message: '手机号码格式不正确', trigger: 'blur' }
         ],
         servicePhone: [
           {

jsowell-ui/src/views/system/user/index.vue

@@ -29,10 +29,10 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item label="登录名称" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="请输入登录名称"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -138,7 +138,7 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="登录名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
@@ -207,6 +207,13 @@
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+          <el-row>
+              <el-col :span="12">
+                  <el-form-item label="登录名称" prop="userName">
+                      <el-input v-model="form.userName" placeholder="请输入登录名称" maxlength="16" />
+                  </el-form-item>
+              </el-col>
+          </el-row>
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">