diff --git a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java b/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java index b03a7d268..3322b65fc 100644 --- a/jsowell-admin/src/main/java/com/jsowell/api/uniapp/MemberController.java +++ b/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); diff --git a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java index a645dd754..63c4f784f 100644 --- a/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java +++ b/jsowell-admin/src/main/java/com/jsowell/service/MemberService.java @@ -223,18 +223,24 @@ public class MemberService { /** * 处理用户信息 * - * @param dto 用户个人信息 + * @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() - .avatarUrl(dto.getAvatarUrl()) - .mobileNumber(dto.getMobileNumber()) - .nickName(dto.getNickName()) - .build(); - memberBasicInfoService.updateMemberBasicInfo(memberInfo); + if (StringUtils.isNotBlank(dto.getAvatarUrl())) { + memberBasicInfo.setAvatarUrl(dto.getAvatarUrl()); + } + if (StringUtils.isNotBlank(dto.getMobileNumber())) { + memberBasicInfo.setMobileNumber(dto.getMobileNumber()); + } + if (StringUtils.isNotBlank(dto.getNickName())) { + memberBasicInfo.setNickName(dto.getNickName()); + } + memberBasicInfoService.updateMemberBasicInfo(memberBasicInfo); } } diff --git a/jsowell-admin/src/main/resources/application-prd.yml b/jsowell-admin/src/main/resources/application-prd.yml index 494ba85d5..669ce645e 100644 --- a/jsowell-admin/src/main/resources/application-prd.yml +++ b/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 ########################微信支付参数####################################### #微信商户号 diff --git a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/MainDemo.java b/jsowell-pile/src/main/java/com/jsowell/adapay/demo/MainDemo.java index fb56aa38b..e8d5adc0a 100644 --- a/jsowell-pile/src/main/java/com/jsowell/adapay/demo/MainDemo.java +++ b/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 { diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 5987eb3fb..704ed6be1 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/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; // 拿到所有数据 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java index 48e4606d6..842b96298 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/PileBasicInfoServiceImpl.java +++ b/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; diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java index dbcf5e205..24a874c27 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java @@ -59,4 +59,8 @@ public class MemberVO { */ private List plateNumberList; + /** + * 头像地址 + */ + private String avatarUrl; } diff --git a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 76cc6c6f2..856ff5653 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -165,7 +165,7 @@ FROM member_basic_info WHERE del_flag = '0' - and member_id = #{memberId,jdbcType=VARCHAR,jdbcType=VARCHAR} + and member_id = #{memberId,jdbcType=VARCHAR} @@ -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 diff --git a/jsowell-ui/src/views/billing/template/components/addBilling.vue b/jsowell-ui/src/views/billing/template/components/addBilling.vue index 62430c08b..556990a49 100644 --- a/jsowell-ui/src/views/billing/template/components/addBilling.vue +++ b/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})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], servicePriceA: [ { required: true, message: "请输入数字", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], electricityPriceB: [ { required: true, message: "请输入数字", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], servicePriceB: [ { required: true, message: "请输入数字", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], electricityPriceC: [ { required: true, message: "请输入数字", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], servicePriceC: [ { required: true, message: "请输入数字", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], electricityPriceD: [ { required: true, message: "请输入数字", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], servicePriceD: [ { required: true, message: "请输入数字", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], @@ -406,8 +406,8 @@ export default { minMoney: [ { required: true, message: "最小单位费用多少元", trigger: "blur" }, { - pattern: /^[0-9]+(.[0-9]{1,2})?$/, - message: "可以保留两位小数", + pattern: /^[0-9]+(.[0-9]{1,5})?$/, + message: "可以保留五位小数", trigger: "blur", }, ], diff --git a/jsowell-ui/src/views/order/order/index.vue b/jsowell-ui/src/views/order/order/index.vue index 42073d586..c0b550c77 100644 --- a/jsowell-ui/src/views/order/order/index.vue +++ b/jsowell-ui/src/views/order/order/index.vue @@ -160,7 +160,7 @@ class="link-type" >订单编号：{{item.orderCode}} - {{item.orderStatusDescribe}} + {{item.orderStatusDescribe}}
开始时间：{{item.chargeStartTime || '一'}}
@@ -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'; diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue index b07be55fb..1830b113d 100644 --- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue +++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue @@ -2,7 +2,7 @@
上传图片
- + @@ -54,7 +54,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -157,8 +157,7 @@ @@ -167,7 +166,7 @@ @@ -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,11 +295,11 @@ export default { ], }, fileList: [], // 用于图片回显 - dialogVisible: null, + // dialogVisible: null, }; }, created() { - + }, methods: { handleSuccess(res, file) {