From d71b3bb014ab84446d1f20600b2b589d7f090e29 Mon Sep 17 00:00:00 2001 From: JS-LM <2497833386@QQ.com> Date: Sat, 3 Jun 2023 11:16:00 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=85=E7=94=B5?= =?UTF-8?q?=E8=AE=A2=E5=8D=95=E7=8A=B6=E6=80=81=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-ui/src/views/order/order/index.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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'; From 846572d0f5e65ec112ba494013dfbddad06d29b9 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 3 Jun 2023 11:37:15 +0800 Subject: [PATCH 2/8] update --- .../src/main/java/com/jsowell/adapay/demo/MainDemo.java | 2 +- .../jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) 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 ca324dd34..58dbd9caa 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 @@ -1168,7 +1168,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; // 拿到所有数据 From 197db2a78752cd4ee92af266d316daae66621655 Mon Sep 17 00:00:00 2001 From: JS-LM <2497833386@QQ.com> Date: Sat, 3 Jun 2023 11:58:07 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BF=9D=E7=95=99=E4=BA=94=E4=BD=8D=E5=B0=8F?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/components/addBilling.vue | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) 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", }, ], From 5438cc69a1939e92b5796fe116537a8fddbc6c63 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 3 Jun 2023 14:04:21 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=98=BF=E9=87=8C?= =?UTF-8?q?=E4=BA=91oss=20bucket=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jsowell-admin/src/main/resources/application-prd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 ########################微信支付参数####################################### #微信商户号 From 056cbd8853e2bbf2a97f47c2a15babbe199511a5 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 3 Jun 2023 14:41:22 +0800 Subject: [PATCH 5/8] update --- jsowell-ui/src/views/pile/station/components/SiteInfo.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue index b07be55fb..9dcad884e 100644 --- a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue +++ b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue @@ -295,7 +295,7 @@ export default { ], }, fileList: [], // 用于图片回显 - dialogVisible: null, + // dialogVisible: null, }; }, created() { From d77bdce678ce0a66e12823edd949b31afc39a9c0 Mon Sep 17 00:00:00 2001 From: JS-LM <2497833386@QQ.com> Date: Sat, 3 Jun 2023 14:54:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=9B=BE=E7=89=87action=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pile/station/components/SiteInfo.vue | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/jsowell-ui/src/views/pile/station/components/SiteInfo.vue b/jsowell-ui/src/views/pile/station/components/SiteInfo.vue index b07be55fb..59149d6f6 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() @@ -299,7 +299,7 @@ export default { }; }, created() { - + }, methods: { handleSuccess(res, file) { From 5d5d0ae21ddcf3607fcc358138017ad215d487e9 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 3 Jun 2023 15:35:12 +0800 Subject: [PATCH 7/8] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E4=BC=9A?= =?UTF-8?q?=E5=91=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsowell/api/uniapp/MemberController.java | 5 ++-- .../com/jsowell/service/MemberService.java | 24 ++++++++++++------- .../impl/PileBasicInfoServiceImpl.java | 1 - .../mapper/pile/MemberBasicInfoMapper.xml | 2 +- 4 files changed, 19 insertions(+), 13 deletions(-) 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-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/resources/mapper/pile/MemberBasicInfoMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml index 76cc6c6f2..6a3346c9e 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} From f19c24728a7127477662a6d4e2eb18a4115f9b50 Mon Sep 17 00:00:00 2001 From: "autumn.g@foxmail.com" Date: Sat, 3 Jun 2023 15:47:55 +0800 Subject: [PATCH 8/8] update --- .../src/main/java/com/jsowell/pile/vo/uniapp/MemberVO.java | 4 ++++ .../src/main/resources/mapper/pile/MemberBasicInfoMapper.xml | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) 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 6a3346c9e..856ff5653 100644 --- a/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml +++ b/jsowell-pile/src/main/resources/mapper/pile/MemberBasicInfoMapper.xml @@ -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