From b979f770975350e547f8ac7fd6dbee6cefc4cdca Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Mon, 29 May 2023 09:51:19 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/App.vue | 1 - yudao-ui-app/libs/pay.js | 4 ++-- yudao-ui-app/pages/goods_cashier/index.vue | 1 - yudao-ui-app/pages/index/index.vue | 2 +- yudao-ui-app/utils/request.js | 1 - 5 files changed, 3 insertions(+), 6 deletions(-) diff --git a/yudao-ui-app/App.vue b/yudao-ui-app/App.vue index 8d3bbc918..3985d9038 100644 --- a/yudao-ui-app/App.vue +++ b/yudao-ui-app/App.vue @@ -219,7 +219,6 @@ // 获取推广员ID setSpreadId() { const spreadId = this.$route.query.spreadId || '' - console.log('spreadId', spreadId) if (spreadId) { this.$store.commit("SET_SPREADID", spreadId); } diff --git a/yudao-ui-app/libs/pay.js b/yudao-ui-app/libs/pay.js index 1f09568a4..0fcc8b728 100644 --- a/yudao-ui-app/libs/pay.js +++ b/yudao-ui-app/libs/pay.js @@ -42,9 +42,9 @@ const unityPay = (options) => { } _options.payInfo.openid = openId if (_options.payType === 'WXPAY') { - _options.payInfo.payChannel = '微信支付' + _options.payInfo.payChannel = 'public' } else if (_options.payType === 'ALIPAY') { - _options.payInfo.payChannel = '支付宝' + _options.payInfo.payChannel = 'appAliPay' } uni.showLoading({ title: '支付中', diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue index edfed8233..554554211 100644 --- a/yudao-ui-app/pages/goods_cashier/index.vue +++ b/yudao-ui-app/pages/goods_cashier/index.vue @@ -198,7 +198,6 @@ payType: that.paytype, createOrderFun: wechatOrderPay, payResultHandle: (res) => { - console.log(res) return { jsapiResult: res.jsapiConfig, body: res.body diff --git a/yudao-ui-app/pages/index/index.vue b/yudao-ui-app/pages/index/index.vue index 18246ba30..1e66621ad 100644 --- a/yudao-ui-app/pages/index/index.vue +++ b/yudao-ui-app/pages/index/index.vue @@ -208,7 +208,7 @@ followHid: true, followCode: false, logoUrl: "", - bannerList: {}, + bannerList: [], imgUrls: [], itemNew: [], menus: [], diff --git a/yudao-ui-app/utils/request.js b/yudao-ui-app/utils/request.js index dcd6a5386..152718363 100644 --- a/yudao-ui-app/utils/request.js +++ b/yudao-ui-app/utils/request.js @@ -26,7 +26,6 @@ function baseRequest(url, method, data, { if (!noAuth) { //登录过期自动登录 if (!store.state.app.token && !checkLogin()) { - console.log(store.state.app.token,checkLogin(),123123) toLogin(); return Promise.reject({ msg: '未登录' From bd53fae597ed407b98172d2254d8103f14e248a3 Mon Sep 17 00:00:00 2001 From: Jruome <2559028966@qq.com> Date: Mon, 29 May 2023 10:19:13 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=20=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E8=B7=AF=E7=94=B1=E6=A0=87=E8=AF=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin/src/router/index.js | 24 +++++++++---------- .../freightSet/creatTemplates.vue | 2 +- .../views/deliverGoods/freightSet/index.vue | 6 ++--- .../src/views/mall/product/property/index.vue | 8 +++---- .../src/views/mall/trade/afterSale/index.vue | 2 +- .../src/views/member/promoter/index.vue | 4 ++-- .../src/views/member/user/index.vue | 2 +- .../src/views/shop/phoneRecord/index.vue | 2 +- .../src/views/shop/rechargeGear/index.vue | 2 +- .../src/views/shop/rechargeOrder/index.vue | 8 +++---- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/yudao-ui-admin/src/router/index.js b/yudao-ui-admin/src/router/index.js index af9c8d102..05a23465c 100644 --- a/yudao-ui-admin/src/router/index.js +++ b/yudao-ui-admin/src/router/index.js @@ -64,18 +64,18 @@ export const constantRoutes = [ component: (resolve) => require(['@/views/error/401'], resolve), hidden: true }, - { - path: '', - component: Layout, - redirect: 'index', - children: [{ - path: 'index', - component: (resolve) => require(['@/views/index'], resolve), - name: '首页', - meta: {title: '首页', icon: 'dashboard', affix: true} - } - ] - }, + // { + // path: '', + // component: Layout, + // redirect: 'index', + // children: [{ + // path: 'index', + // component: (resolve) => require(['@/views/index'], resolve), + // name: '首页', + // meta: {title: '首页', icon: 'dashboard', affix: true} + // } + // ] + // }, { path: '/user', component: Layout, diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue index 9a1761ef2..7b6dcf338 100644 --- a/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue +++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/creatTemplates.vue @@ -158,7 +158,7 @@ 取 消 - 确 定 + 确 定 diff --git a/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue b/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue index 49b94e9aa..2c14b42a6 100644 --- a/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue +++ b/yudao-ui-admin/src/views/deliverGoods/freightSet/index.vue @@ -11,7 +11,7 @@ - 添加运费模板 + 添加运费模板 diff --git a/yudao-ui-admin/src/views/mall/product/property/index.vue b/yudao-ui-admin/src/views/mall/product/property/index.vue index 2f1a42af7..8169f14d6 100644 --- a/yudao-ui-admin/src/views/mall/product/property/index.vue +++ b/yudao-ui-admin/src/views/mall/product/property/index.vue @@ -12,8 +12,8 @@
- 添加商品规格 - 批量删除 + 添加商品规格 + 批量删除
diff --git a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue index 271ecd269..c4447b861 100644 --- a/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue +++ b/yudao-ui-admin/src/views/mall/trade/afterSale/index.vue @@ -37,7 +37,7 @@ :picker-options="datePickerOptions" :default-time="['00:00:00', '23:59:59']" /> - 搜索 + 搜索 重置 diff --git a/yudao-ui-admin/src/views/member/promoter/index.vue b/yudao-ui-admin/src/views/member/promoter/index.vue index 333d1e5f1..403cc91e9 100644 --- a/yudao-ui-admin/src/views/member/promoter/index.vue +++ b/yudao-ui-admin/src/views/member/promoter/index.vue @@ -21,7 +21,7 @@ - 搜索 + 搜索 重置 @@ -35,7 +35,7 @@ 导入 + v-hasPermi="['member:promoter:export']">导入 diff --git a/yudao-ui-admin/src/views/member/user/index.vue b/yudao-ui-admin/src/views/member/user/index.vue index 771c43762..a25b53587 100644 --- a/yudao-ui-admin/src/views/member/user/index.vue +++ b/yudao-ui-admin/src/views/member/user/index.vue @@ -17,7 +17,7 @@ - 搜索 + 搜索 重置 diff --git a/yudao-ui-admin/src/views/shop/phoneRecord/index.vue b/yudao-ui-admin/src/views/shop/phoneRecord/index.vue index 9a708d5d3..3200c199e 100644 --- a/yudao-ui-admin/src/views/shop/phoneRecord/index.vue +++ b/yudao-ui-admin/src/views/shop/phoneRecord/index.vue @@ -9,7 +9,7 @@ - 搜索 + 搜索 重置 diff --git a/yudao-ui-admin/src/views/shop/rechargeGear/index.vue b/yudao-ui-admin/src/views/shop/rechargeGear/index.vue index 37f70a36c..1e2691128 100644 --- a/yudao-ui-admin/src/views/shop/rechargeGear/index.vue +++ b/yudao-ui-admin/src/views/shop/rechargeGear/index.vue @@ -7,7 +7,7 @@ - 搜索 + 搜索 重置 diff --git a/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue b/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue index 76df141a8..601f66e57 100644 --- a/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue +++ b/yudao-ui-admin/src/views/shop/rechargeOrder/index.vue @@ -28,7 +28,7 @@ - 搜索 + 搜索 重置 @@ -90,12 +90,12 @@ From e79abc1405b30e7a6b8e825b399e499a4cb2a810 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Mon, 29 May 2023 12:54:00 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=88=86=E9=94=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shop/controller/app/member/MemberController.java | 9 +++------ .../shop/service/recharge/RechargeOrderServiceImpl.java | 5 +++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java index a3e2f99bb..8343e7c22 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/app/member/MemberController.java @@ -20,10 +20,7 @@ import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -63,10 +60,10 @@ public class MemberController { return CommonResult.success(rechargeOrderService.memberOrderInfo()); } @Operation(summary = "获取当前登录账号的推广员推广会员记录") - @RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.GET) + @RequestMapping(value = "/promoterOrderInfo", method = RequestMethod.POST) @PreAuthenticated @TenantIgnore - public CommonResult> promoterOrderInfo(RechargeOrderPageReqVO pageRespVO) { + public CommonResult> promoterOrderInfo(@RequestBody RechargeOrderPageReqVO pageRespVO) { pageRespVO.setPromoterId(SecurityFrameworkUtils.getLoginUserId()); return CommonResult.success(rechargeOrderService.promoterOrderInfo(pageRespVO)); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java index e35cb0b5f..1be0c09eb 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeOrderServiceImpl.java @@ -207,7 +207,7 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(LocalDateTime.now())); appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(LocalDateTime.now())); }else if (type == 2){ - LocalDateTime todayOfLastWeek = LocalDateTime.now(); + LocalDateTime todayOfLastWeek = LocalDateTime.now().minusDays(7); LocalDateTime monday = todayOfLastWeek.with(TemporalAdjusters.previous(DayOfWeek.SUNDAY)).plusDays(1); LocalDateTime sunday = todayOfLastWeek.with(TemporalAdjusters.next(DayOfWeek.MONDAY)).minusDays(1); appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(monday)); @@ -219,7 +219,8 @@ public class RechargeOrderServiceImpl implements RechargeOrderService { appUserInfoReqDTO.setStartTime(LocalDateTimeUtil.beginOfDay(firstDay)); appUserInfoReqDTO.setEndTime(LocalDateTimeUtil.endOfDay(lastDay)); } - promoterMemberOrderVO.setTotalAmount(rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId)); + BigDecimal totalAmount =rechargeOrderMapper.promoterOrderCount(appUserInfoReqDTO.getStartTime(),appUserInfoReqDTO.getEndTime(),promoterId); + promoterMemberOrderVO.setTotalAmount(totalAmount); promoterMemberOrderVO.setMemberCount(memberUserApi.promoterOrderCount(appUserInfoReqDTO)); TenantDTO tenantDTO = tenantApi.getTenant(TenantContextHolder.getTenantId()); promoterMemberOrderVO.setMemberCommission(tenantDTO.getMemberCommission()); From 478c21b7fb843cd66d908fc8e674f7c2e5655dca Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Mon, 29 May 2023 12:54:51 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=88=86=E9=94=80=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-local.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/yudao-server/src/main/resources/application-local.yaml b/yudao-server/src/main/resources/application-local.yaml index ff034d196..b1b9f03ab 100644 --- a/yudao-server/src/main/resources/application-local.yaml +++ b/yudao-server/src/main/resources/application-local.yaml @@ -71,7 +71,9 @@ spring: password: 20221122@dev # 密码，建议生产环境开启 --- #################### 定时任务相关配置 #################### - +mybatis-plus: + configuration: + log-impl: org.apache.ibatis.logging.stdout.StdOutImpl # Quartz 配置项，对应 QuartzProperties 配置类 spring: quartz: