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

jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java

@@ -128,11 +128,12 @@ public class MemberController extends BaseController {
 	 * http://localhost:8080/uniapp/member/saveUserInfo
 	 */
 	@PostMapping("/saveUserInfo")
-	public RestApiResponse<?> saveUserInfo(@RequestBody MemberRegisterDTO dto) {
+	public RestApiResponse<?> saveUserInfo(HttpServletRequest request, @RequestBody MemberRegisterDTO dto) {
 		logger.info("接受前端用户信息并处理 param:{}", JSONObject.toJSONString(dto));
 		RestApiResponse<?> response = null;
 		try {
-			memberService.handleUserInfo(dto);
+			String memberId = getMemberIdByAuthorization(request);
+			memberService.handleUserInfo(memberId, dto);
 			response = new RestApiResponse<>();
 		} catch (Exception e) {
 			logger.error("处理用户信息异常", e);

jsowell-admin/src/main/java/com/jsowell/service/MemberService.java

@@ -223,18 +223,24 @@ public class MemberService {
 	/**
 	 * 处理用户信息
 	 *
+	 * @param memberId
 	 * @param dto      用户个人信息
 	 */
-	public void handleUserInfo(MemberRegisterDTO dto) {
+	public void handleUserInfo(String memberId, MemberRegisterDTO dto) {
 		// 通过用户手机号查询数据库，如果数据库中存在，则更新
-		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getMobileNumber());
+		// MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMobileNumber(dto.getMobileNumber());
+		MemberBasicInfo memberBasicInfo = memberBasicInfoService.selectInfoByMemberId(memberId);
 		if (Objects.nonNull(memberBasicInfo)) {
-			MemberBasicInfo memberInfo = MemberBasicInfo.builder()
+			if (StringUtils.isNotBlank(dto.getAvatarUrl())) {
-					.avatarUrl(dto.getAvatarUrl())
+				memberBasicInfo.setAvatarUrl(dto.getAvatarUrl());
-					.mobileNumber(dto.getMobileNumber())
+			}
-					.nickName(dto.getNickName())
+			if (StringUtils.isNotBlank(dto.getMobileNumber())) {
-					.build();
+				memberBasicInfo.setMobileNumber(dto.getMobileNumber());
-			memberBasicInfoService.updateMemberBasicInfo(memberInfo);
+			}
+			if (StringUtils.isNotBlank(dto.getNickName())) {
+				memberBasicInfo.setNickName(dto.getNickName());
+			}
+			memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo);
 		}
 
 	}

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

@@ -114,11 +114,11 @@ aliyunoss:
   # AccessKey 秘钥
   accessKeySecret: tsxMyujk6KY9h0e4Bx0D7ld16PBUyW
   # bucket名称
-  bucketName: ydc-oss-prd
+  bucketName: ydc-oss-prod
   # bucket下文件夹的路径
   filehost: img
   # 访问域名
-  url: https://ydc-oss-prd.oss-cn-shanghai.aliyuncs.com
+  url: https://ydc-oss-prod.oss-cn-shanghai.aliyuncs.com
 
 ########################微信支付参数#######################################
 #微信商户号

jsowell-pile/src/main/java/com/jsowell/adapay/demo/MainDemo.java

@@ -17,7 +17,7 @@ public class MainDemo {
 		testMerchant();
 
 		//若是技术性渠道商为其它商户提供服务功能，请使用多商户模式
-		// testMultiMerchant();
+		testMultiMerchant();
 	}
 
 	public static void testMerchant() throws Exception {

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

@@ -1167,7 +1167,6 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService {
         if (StringUtils.isBlank(transactionCode)) {
             return resultList;
         }
-        // logger.info("transactionCode:{}", transactionCode);
         String pileConnectorCode = transactionCode.substring(0, 16);
         String redisKey = CacheConstants.PILE_REAL_TIME_MONITOR_DATA + pileConnectorCode + "_" + transactionCode;
         // 拿到所有数据

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

@@ -331,7 +331,6 @@ public class PileBasicInfoServiceImpl implements IPileBasicInfoService {
 
 	@Override
 	public PileInfoVO selectPileInfoBySn(String pileSn) {
-		// TODO 换成缓存方法
 		PileBasicInfo basicInfo = selectPileBasicInfoBySN(pileSn);
 		if (basicInfo == null) {
 			return null;

jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java

@@ -59,4 +59,8 @@ public class MemberVO {
      */
     private List<String> plateNumberList;
 
+    /**
+     * 头像地址
+     */
+    private String avatarUrl;
 }

jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml

@@ -165,7 +165,7 @@
         <include refid="Base_Column_List"/>
         FROM member_basic_info
         WHERE del_flag = '0'
-        and member_id = #{memberId,jdbcType=VARCHAR,jdbcType=VARCHAR}
+        and member_id = #{memberId,jdbcType=VARCHAR}
     </select>
 
     <update id="updateMemberBalance">
@@ -201,7 +201,8 @@
             t1.nick_name as nickName,
             t1.mobile_number as mobileNumber,
             t2.principal_balance as principalBalance,
-            t2.gift_balance as giftBalance
+            t2.gift_balance as giftBalance,
+            t1.avatar_url as avatarUrl
         FROM
             member_basic_info t1
             JOIN member_wallet_info t2 ON t1.member_id = t2.member_id

jsowell-ui/src/views/billing/template/components/addBilling.vue

@@ -341,64 +341,64 @@ export default {
         electricityPriceA: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
         servicePriceA: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
         electricityPriceB: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
         servicePriceB: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
         electricityPriceC: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
         servicePriceC: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
         electricityPriceD: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
         servicePriceD: [
           { required: true, message: "请输入数字", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],
@@ -406,8 +406,8 @@ export default {
         minMoney: [
           { required: true, message: "最小单位费用多少元", trigger: "blur" },
           {
-            pattern: /^[0-9]+(.[0-9]{1,2})?$/,
+            pattern: /^[0-9]+(.[0-9]{1,5})?$/,
-            message: "可以保留两位小数",
+            message: "可以保留五位小数",
             trigger: "blur",
           },
         ],

jsowell-ui/src/views/order/order/index.vue

@@ -160,7 +160,7 @@
             class="link-type"
           >订单编号：{{item.orderCode}}</router-link>
       
-        <el-tag type="success" style="margin-left:10px">{{item.orderStatusDescribe}}</el-tag>
+        <el-tag :type="color(item.orderStatus)" style="margin-left:10px">{{item.orderStatusDescribe}}</el-tag>
       </div>
       <div>开始时间：{{item.chargeStartTime || '一'}}</div>
      </div>
@@ -272,6 +272,10 @@ export default {
     this.dataLoading();
   },
   methods: {
+    color(e){
+ let arr = ['', 'success', 'info', 'warning', 'danger', 'warning', 'success', 'success']
+        return e ? arr[e] : arr[0]
+    },
     showOrHide () {
                 if (this.buttonBoolean) {
                     this.icon = 'el-icon-caret-bottom';

jsowell-ui/src/views/pile/station/components/SiteInfo.vue

@@ -2,7 +2,7 @@
   <div class="app-container">
     <div>上传图片</div>
     <el-upload
-      action="http://localhost:8080/common/uploadOSS"
+      :action="actionUrl"
       :headers="headers"
       list-type="picture-card"
       :on-preview="handlePictureCardPreview"
@@ -23,7 +23,7 @@
       :rules="rules"
       ref="stationRef"
     >
-      <el-row>
+      <el-row :gutter="24">
         <el-col :span="6">
           <el-form-item label="站点名称" prop="stationName">
             <el-input v-model="station.stationName"></el-input>
@@ -54,7 +54,7 @@
         </el-col>
       </el-row>
 
-      <el-row>
+      <el-row :gutter="24">
         <el-col :span="6">
           <el-form-item prop="matchCars" label="适配车辆类型">
             <el-select v-model="station.selectMatchCars" multiple placeholder="请选择">
@@ -96,7 +96,7 @@
         <el-col :span="6">
           <el-form-item prop="merchantAdminName" label="管理员">
             <el-input
-              v-model="
+              :value="
                 station.merchantAdminName === null
                   ? '无'
                   : station.merchantAdminName
@@ -106,7 +106,7 @@
         </el-col>
       </el-row>
 
-      <el-row>
+      <el-row :gutter="24">
         <el-col :span="6">
           <el-form-item prop="stationLng" label="经度">
             <el-input v-model="station.stationLng" disabled></el-input>
@@ -120,7 +120,7 @@
         <el-col :span="6">
           <el-form-item prop="merchantName" label="运营商">
             <el-input
-              v-model="
+              :value="
                 station.merchantName === null ? '无' : station.merchantName
               "
               disabled
@@ -141,7 +141,7 @@
         </el-col>
       </el-row>
 
-      <el-row>
+      <el-row :gutter="24">
         <el-col :span="6">
           <el-form-item prop="construction" label="建设场所">
             <el-select v-model="station.construction" placeholder="请选择">
@@ -157,8 +157,7 @@
         <el-col :span="6">
           <el-form-item prop="electricityPrice" label="充电费率">
             <el-input
-              v-model="
+              :value="station.electricityPrice === null ? 0 : station.electricityPrice
-                station.electricityPrice === null ? 0 : station.electricityPrice
               "
               disabled
             ></el-input>
@@ -167,7 +166,7 @@
         <el-col :span="6">
           <el-form-item prop="servicePrice" label="服务费率">
             <el-input
-              v-model="station.servicePrice === null ? 0 : station.servicePrice"
+              :value="station.servicePrice === null ? 0 : station.servicePrice"
               disabled
             ></el-input>
           </el-form-item>
@@ -196,6 +195,7 @@ export default {
   dicts: ["station_type", "match_cars", "construction_type"],
   data() {
     return {
+      actionUrl:process.env.VUE_APP_BASE_API+'/common/uploadOSS',
       dialogVisible:false,
       headers: {
         Authorization: "Bearer " + getToken()
@@ -295,7 +295,7 @@ export default {
         ],
       },
       fileList: [], // 用于图片回显
-      dialogVisible: null,
+      // dialogVisible: null,
     };
   },
   created() {