From bb12efb2781f643034aa232b05e7736e7607074f Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Tue, 23 May 2023 09:47:23 +0800 Subject: [PATCH 01/14] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-admin/src/settings.js | 10 + .../src/views/system/tenant/index.vue | 4 +- yudao-ui-app/components/countDown/index.vue | 74 +- yudao-ui-app/components/numberScroll.vue | 160 ++++ .../components/paymentMember/index.vue | 47 +- yudao-ui-app/config/app.js | 10 +- yudao-ui-app/pages.json | 6 + yudao-ui-app/pages/goods_cashier/index.vue | 752 ++++++++++++++++++ yudao-ui-app/pages/users/login/index.vue | 6 +- yudao-ui-app/pages/users/register/index.vue | 2 +- .../pages/users/retrievePassword/index.vue | 2 +- .../pages/users/user_spread_code/index.vue | 5 +- 12 files changed, 988 insertions(+), 90 deletions(-) create mode 100644 yudao-ui-app/components/numberScroll.vue create mode 100644 yudao-ui-app/pages/goods_cashier/index.vue diff --git a/yudao-ui-admin/src/settings.js b/yudao-ui-admin/src/settings.js index 045f5eb3f..c3be16571 100644 --- a/yudao-ui-admin/src/settings.js +++ b/yudao-ui-admin/src/settings.js @@ -1,5 +1,15 @@ module.exports = { + /** + * 推广链接域名 + */ + spreadDomain: 'http://h5.cyywl.top', + + /** + * 推广码生成访问H5链接地址 + */ + spreadLink: '/pages/member_application/index', + /** * 侧边栏主题 深色主题theme-dark,浅色主题theme-light */ diff --git a/yudao-ui-admin/src/views/system/tenant/index.vue b/yudao-ui-admin/src/views/system/tenant/index.vue index 9acf6e86e..d026fa14b 100755 --- a/yudao-ui-admin/src/views/system/tenant/index.vue +++ b/yudao-ui-admin/src/views/system/tenant/index.vue @@ -204,6 +204,7 @@ import { getTenantPage, exportTenantExcel } from '@/api/system/tenant'; +import config from '@/settings' import QRCode from 'qrcode' import {CommonStatusEnum} from '@/utils/constants' import {getTenantPackageList} from '@/api/system/tenantPackage'; @@ -345,8 +346,7 @@ export default { this.resetForm('form'); }, handleQRCode(row) { - const baseUrl = 'http://yuxy.perrymake.com' - const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${row.id}` + const url =`${config.spreadDomain}${config.spreadLink}?redirectUrl=${config.spreadDomain}&tenantId=${row.id}` QRCode.toCanvas(document.getElementById(`id-${row.id}`), url, { scale: 2 }, function (error) { diff --git a/yudao-ui-app/components/countDown/index.vue b/yudao-ui-app/components/countDown/index.vue index 291c6e6e5..b0e6e12c2 100644 --- a/yudao-ui-app/components/countDown/index.vue +++ b/yudao-ui-app/components/countDown/index.vue @@ -1,14 +1,14 @@ @@ -49,13 +49,13 @@ type: Boolean, default: true }, - isCol: { - type: Boolean, - default: false + bgColor:{ + type: String, + default: "" }, - bgColor: { - type: Object, - default: null + colors:{ + type: String, + default: "" } }, data: function() { @@ -116,47 +116,13 @@ }; - diff --git a/yudao-ui-app/components/numberScroll.vue b/yudao-ui-app/components/numberScroll.vue new file mode 100644 index 000000000..2ace75d54 --- /dev/null +++ b/yudao-ui-app/components/numberScroll.vue @@ -0,0 +1,160 @@ + + + + + diff --git a/yudao-ui-app/components/paymentMember/index.vue b/yudao-ui-app/components/paymentMember/index.vue index f44fa2875..fe28f204d 100644 --- a/yudao-ui-app/components/paymentMember/index.vue +++ b/yudao-ui-app/components/paymentMember/index.vue @@ -22,7 +22,8 @@ - + + @@ -65,35 +66,35 @@ data() { return { alipayShow: false, - alipayForm:`链接已复制,请到外部浏览器完成支付` + alipayForm: `链接已复制,请到外部浏览器完成支付` }; }, computed: mapGetters(['systemPlatform', 'openId']), methods: { - handleConfirm(){ + handleConfirm() { this.alipayShow = false window.location.reload() }, // 复制操作 - _copy(context) { - // 创建输入框元素 - let oInput = document.createElement('input'); - // 将想要复制的值 - oInput.value = context; - // 页面底部追加输入框 - document.body.appendChild(oInput); - // 选中输入框 - oInput.select(); - // 执行浏览器复制命令 - document.execCommand('Copy'); - // 弹出复制成功信息 - this.$util.Tips({ - title: '复制链接成功' - }) - this.alipayShow = true - // 复制后移除输入框 - oInput.remove(); - }, + _copy(context) { + // 创建输入框元素 + let oInput = document.createElement('input'); + // 将想要复制的值 + oInput.value = context; + // 页面底部追加输入框 + document.body.appendChild(oInput); + // 选中输入框 + oInput.select(); + // 执行浏览器复制命令 + document.execCommand('Copy'); + // 弹出复制成功信息 + this.$util.Tips({ + title: '复制链接成功' + }) + this.alipayShow = true + // 复制后移除输入框 + oInput.remove(); + }, close: function() { this.$emit('onChangeFun', { action: 'payClose' @@ -139,7 +140,7 @@ title: '支付中', mask: true }); - if(paytype === 'WXPAY' && !that.openId) { + if (paytype === 'WXPAY' && !that.openId) { return that.$util.Tips({ title: '请在微信客户端进行支付操作' }); diff --git a/yudao-ui-app/config/app.js b/yudao-ui-app/config/app.js index d42b88408..4c65e8dab 100644 --- a/yudao-ui-app/config/app.js +++ b/yudao-ui-app/config/app.js @@ -1,12 +1,12 @@ -let domain = 'http://yuxy.perrymake.com' +let domain = 'http://api.cyywl.top' module.exports = { // 请求域名 格式: https://您的域名 // #ifdef MP HTTP_REQUEST_URL: domain, // #endif - HTTP_ADMIN_URL:'http://yuxy.perrymake.com', //PC后台的API请求地址,上传图片用 + HTTP_ADMIN_URL:'http://api.cyywl.top', //PC后台的API请求地址,上传图片用 // #ifdef H5 //H5接口是浏览器地址 // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, @@ -25,5 +25,9 @@ module.exports = { // 缓存时间 0 永久 EXPIRE:0, //分页最多显示条数 - LIMIT: 10 + LIMIT: 10, + // 推广链接域名 + SPREAD_DOMAIN: 'http://h5.cyywl.top', + // 推广码生成访问H5链接地址 + SPREAD_LINK: '/pages/member_application/index', }; diff --git a/yudao-ui-app/pages.json b/yudao-ui-app/pages.json index 73cc78bfb..f85e987c1 100644 --- a/yudao-ui-app/pages.json +++ b/yudao-ui-app/pages.json @@ -46,6 +46,12 @@ "navigationBarTitleText": "购物车" } }, + { + "path": "pages/goods_cashier/index", + "style": { + "navigationBarTitleText": "收银台" + } + }, { "path": "pages/user/index", "style": { diff --git a/yudao-ui-app/pages/goods_cashier/index.vue b/yudao-ui-app/pages/goods_cashier/index.vue new file mode 100644 index 000000000..cc6cc9ab1 --- /dev/null +++ b/yudao-ui-app/pages/goods_cashier/index.vue @@ -0,0 +1,752 @@ + + + + + diff --git a/yudao-ui-app/pages/users/login/index.vue b/yudao-ui-app/pages/users/login/index.vue index 36d01c63b..90f8adb92 100644 --- a/yudao-ui-app/pages/users/login/index.vue +++ b/yudao-ui-app/pages/users/login/index.vue @@ -379,7 +379,7 @@ background-size:100% 672rpx; .logo-wrap { - margin: 285rpx 0 85rpx 0; + margin: 185rpx 0 85rpx 0; display:flex; align-items:center; img{ @@ -478,7 +478,7 @@ justify-content: center; width: 100%; height: 87rpx; - margin-top: 237rpx; + margin-top: 137rpx; color: #FFFFFF; font-size: 32rpx; background: linear-gradient(0deg, #E63163 0%, #FF819F 100%); @@ -486,7 +486,7 @@ } .tips { - margin: 125rpx 20rpx 0 20rpx; + margin: 60rpx 20rpx 0 20rpx; font-size: 24rpx; color: #000; display: flex; diff --git a/yudao-ui-app/pages/users/register/index.vue b/yudao-ui-app/pages/users/register/index.vue index 30b4ba1ce..675d9e2d9 100644 --- a/yudao-ui-app/pages/users/register/index.vue +++ b/yudao-ui-app/pages/users/register/index.vue @@ -206,7 +206,7 @@ background-size:100% 672rpx; .logo-wrap { - margin: 285rpx 0 85rpx 0; + margin: 185rpx 0 85rpx 0; display:flex; align-items:center; img{ diff --git a/yudao-ui-app/pages/users/retrievePassword/index.vue b/yudao-ui-app/pages/users/retrievePassword/index.vue index 06812bd90..7b9fa568d 100644 --- a/yudao-ui-app/pages/users/retrievePassword/index.vue +++ b/yudao-ui-app/pages/users/retrievePassword/index.vue @@ -154,7 +154,7 @@ background-size: 100% 672rpx; .logo-wrap { - margin: 285rpx 0 85rpx 0; + margin: 185rpx 0 85rpx 0; display:flex; align-items:center; img{ diff --git a/yudao-ui-app/pages/users/user_spread_code/index.vue b/yudao-ui-app/pages/users/user_spread_code/index.vue index 81605e4f1..50064ea71 100644 --- a/yudao-ui-app/pages/users/user_spread_code/index.vue +++ b/yudao-ui-app/pages/users/user_spread_code/index.vue @@ -58,6 +58,7 @@ import { imageBase64 } from "@/api/public"; + import appConfig from '@/config/app.js' export default { components: { // #ifdef MP @@ -203,9 +204,7 @@ let that = this; let href = ''; // href = window.location.href.split('/pages')[0]; - console.log('uid', that.uid) - const baseUrl = 'http://yuxy.perrymake.com'; - const url =`${baseUrl}/pages/member_application/index?redirectUrl=${baseUrl}&tenantId=${that.tenantId}&spreadId=${that.uid}` + const url =`${appConfig.SPREAD_DOMAIN}${appConfig.SPREAD_LINK}?redirectUrl=${appConfig.SPREAD_DOMAIN}&tenantId=${that.tenantId}&spreadId=${that.uid}` console.log('url', url) uQRCode.make({ canvasId: 'qrcode', From 109852819319f3443026f6eace6ccaf41c780f4a Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Tue, 23 May 2023 10:30:53 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/impl/StoreOrderServiceImpl.java | 10 +++++++++ .../yudao/module/system/api/dept/DeptApi.java | 12 ++++++++++ .../module/system/api/dept/DeptApiImpl.java | 16 ++++++++++++++ .../system/service/dept/DeptService.java | 13 +++++++++++ .../system/service/dept/DeptServiceImpl.java | 22 +++++++++++++++++++ 5 files changed, 73 insertions(+) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java index b276db42f..10cb26d90 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/order/impl/StoreOrderServiceImpl.java @@ -52,6 +52,8 @@ import cn.iocoder.yudao.module.shop.utils.RedisUtil; import cn.iocoder.yudao.module.shop.vo.order.LogisticsResultVo; import cn.iocoder.yudao.module.shop.vo.order.StoreDateRangeSqlPram; import cn.iocoder.yudao.module.shop.vo.order.StoreOrderInfoOldVo; +import cn.iocoder.yudao.module.system.api.dept.DeptApi; +import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import com.alipay.api.AlipayApiException; import com.alipay.api.internal.util.AlipaySignature; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -147,6 +149,8 @@ public class StoreOrderServiceImpl extends ServiceImpl orderInfos = request.getOrderInfos(); orderDO.setOrderId(code); diff --git a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java index ebefd9756..2111d51b7 100644 --- a/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java +++ b/yudao-module-system/yudao-module-system-api/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApi.java @@ -48,6 +48,18 @@ public interface DeptApi { */ void validateDeptList(Collection ids); + /** + *
+    * findParentDept
+    * Description:查询当前租户根节点
+    * @author: zenghuapei
+    * @date: 2023/5/23 09:38
+    * @param :
+    * @return
+    * 
+ */ + DeptRespDTO findParentDept(Long tenantId); + /** * 获得指定编号的部门 Map * diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java index bf679107d..ca7f84640 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java @@ -38,6 +38,22 @@ public class DeptApiImpl implements DeptApi { List depts = deptService.getDeptList(new DeptListReqVO()); return DeptConvert.INSTANCE.convertList03(depts); } + + /** + *
+     * findParentDept
+     * Description:查询当前租户根节点
+     * @author: zenghuapei
+     * @date: 2023/5/23 09:38
+     * @return
+     * 
+ */ + @Override + public DeptRespDTO findParentDept(Long tenantId) { + DeptDO deptDO = deptService.findParentDept(tenantId ); + return DeptConvert.INSTANCE.convert03(deptDO); + } + @Override public void validateDeptList(Collection ids) { deptService.validateDeptList(ids); diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java index 87033d4b3..6d68c3d51 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.system.service.dept; import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils; +import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; @@ -54,6 +55,18 @@ public interface DeptService { */ List getDeptList(DeptListReqVO reqVO); + /** + *
+    * findParentDept
+    * Description:查询根节点
+    * @author: zenghuapei
+    * @date: 2023/5/23 09:40
+    * @param tenantId:
+    * @return
+    * 
+ */ + DeptDO findParentDept(Long tenantId); + /** * 获得所有子部门,从缓存中 * diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java index 89f98f8b9..0fb718f13 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.framework.tenant.core.util.TenantUtils; +import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptCreateReqVO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptListReqVO; import cn.iocoder.yudao.module.system.controller.admin.dept.vo.dept.DeptUpdateReqVO; @@ -13,6 +14,7 @@ import cn.iocoder.yudao.module.system.dal.mysql.dept.DeptMapper; import cn.iocoder.yudao.module.system.enums.dept.DeptIdEnum; import cn.iocoder.yudao.module.system.mq.producer.dept.DeptProducer; import com.baomidou.mybatisplus.core.toolkit.IdWorker; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMultimap; import com.google.common.collect.Multimap; @@ -152,6 +154,26 @@ public class DeptServiceImpl implements DeptService { return deptMapper.selectList(reqVO); } + + /** + *
+     * findParentDept
+     * Description:查询根节点
+     * @author: zenghuapei
+     * @date: 2023/5/23 09:40
+     * @param tenantId :
+     * @return
+     * 
+ */ + @Override + public DeptDO findParentDept(Long tenantId) { + List deptDOs = deptMapper.selectList(Wrappers.lambdaQuery(DeptDO.class).eq(DeptDO::getParentId,DeptIdEnum.ROOT.getId()).eq(DeptDO::getTenantId,tenantId)); + if(deptDOs!=null && deptDOs.size() > 0){ + return deptDOs.get(0); + } + return null; + } + @Override public List getDeptListByParentIdFromCache(Long parentId, boolean recursive) { if (parentId == null) { From 0e3b3bf667a1da8e24998ddf415540939fe7b13c Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Tue, 23 May 2023 10:34:09 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=91=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/member/controller/app/user/AppUserController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java index 9121908f6..ba91db9ae 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/controller/app/user/AppUserController.java @@ -116,7 +116,7 @@ public class AppUserController { List list = new ArrayList<>(); UserSpreadBannerVO userSpreadBannerVO = new UserSpreadBannerVO(); userSpreadBannerVO.setId(1); - userSpreadBannerVO.setPic("http://192.168.1.147:48080/admin-api/infra/file/4/get/431efea27162d536d35f7b3c0b844ede98a6ba58f4fd72ac7181e7ee5ebae77a.jpg"); + userSpreadBannerVO.setPic("http://image.cyywl.top/431efea27162d536d35f7b3c0b844ede98a6ba58f4fd72ac7181e7ee5ebae77a.jpg"); userSpreadBannerVO.setTitle("推广背景图"); list.add(userSpreadBannerVO); return CommonResult.success(list); From bbb204191a909811a3fe84cd34ddd519e7347feb Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Tue, 23 May 2023 11:00:24 +0800 Subject: [PATCH 04/14] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=85=AC=E4=BC=97?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-prod.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index fef802529..9e5ffdb73 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -151,8 +151,8 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta database: 16 # 数据库索引 password: cyywl123.. # 密码,建议生产环境开启 # 公众号配置(必填) - app-id: wx041349c6f39b268b - secret: 5abee519483bc9f8cb37ce280e814bd0 + app-id: wx7e503d9cded34c07 + secret: 31883ca14e2cbac8610d30f8f945ee47 # 存储配置,解决 AccessToken 的跨节点的共享 config-storage: type: RedisTemplate # 采用 RedisTemplate 操作 Redis,会自动从 Spring 中获取 From 032074a119caf318b5736302cb65a2b02ff977ba Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Tue, 23 May 2023 11:05:48 +0800 Subject: [PATCH 05/14] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-prod.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 9e5ffdb73..5bbf31b45 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -168,7 +168,7 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta pay: one: enabled: true - app-id: wxb1826c88da21d81e + app-id: wx7e503d9cded34c07 mch-id: 1641993417 mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM apiv3-key: cyywl666666cyywl888888cyywl66666 From 2adf4d610a872192ff4fe0be1a2e430052e7cb5c Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Tue, 23 May 2023 11:12:28 +0800 Subject: [PATCH 06/14] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-server/src/main/resources/application-prod.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yudao-server/src/main/resources/application-prod.yaml b/yudao-server/src/main/resources/application-prod.yaml index 5bbf31b45..6d7f99628 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -169,13 +169,13 @@ wx: # 参见 https://github.com/Wechat-Group/WxJava/blob/develop/spring-boot-sta one: enabled: true app-id: wx7e503d9cded34c07 - mch-id: 1641993417 + mch-id: 1641073271 mch-key: qdn2I7Cmx4JeiKOt2CDjiu6UHgLTsOsM - apiv3-key: cyywl666666cyywl888888cyywl66666 + apiv3-key: cyywl123456cyywl654321cyywl12345 private-cert-path: classpath:/1/apiclient_cert.pem private-key-path: classpath:/1/apiclient_key.pem key-path: classpath:/1/apiclient_cert.p12 - cert-serial-no: 58FDB503F92B6C0E258C9940BB726C2BF6022E56 + cert-serial-no: 7F76A4ADC52CA0B440C4E5698F8A5CD1633A0FCD notify-url: http://api.cyywl.top/app-api/pay/wxpay/pay_notify refund-notify-url: http://api.cyywl.top/app-api/pay/wxpay/refund_notify two: From aa884231535634ee37784e8c1ffba4266822160b Mon Sep 17 00:00:00 2001 From: tangqian Date: Tue, 23 May 2023 11:23:15 +0800 Subject: [PATCH 07/14] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E6=A1=A3?= =?UTF-8?q?=E6=AC=A1=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../order/StoreOrderDetailInfoResponse.java | 4 ++ .../recharge/RechargeGearServiceImpl.java | 50 ++++++++----------- 2 files changed, 24 insertions(+), 30 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java b/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java index b8663a3c1..931d07b87 100644 --- a/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java +++ b/yudao-module-mall/yudao-module-shop-api/src/main/java/cn/iocoder/yudao/module/shop/response/order/StoreOrderDetailInfoResponse.java @@ -1,9 +1,11 @@ package cn.iocoder.yudao.module.shop.response.order; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.math.BigDecimal; @@ -85,6 +87,8 @@ public class StoreOrderDetailInfoResponse implements Serializable { private String payType; @Schema(description = "创建时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; @Schema(description = "订单状态(0:待发货;1:待收货;2:已收货,待评价;3:已完成;)") diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java index a184481e6..7ce76a52e 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/recharge/RechargeGearServiceImpl.java @@ -107,21 +107,16 @@ public class RechargeGearServiceImpl implements RechargeGearService { List rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.lambdaQuery() .eq(RechargeGearDO::getDeleted, 0)); List rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS); - RechargeOrderDO orderDO = orderMapper.selectOne(Wrappers.lambdaQuery().eq(RechargeOrderDO::getUid, loginUser.getId()) - .eq(RechargeOrderDO::getPaid,1) - .last("LIMIT 1")); - if (Objects.nonNull(orderDO)) { - List infoDOS = phoneRecordMapper.selectList(Wrappers.lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderDO.getId())); - Map> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId)); - rechargeGearRespVOS.forEach(vo -> { - List infoDOS1 = collect.get(vo.getId()); - if (!CollectionUtils.isEmpty(infoDOS1)) { - vo.setIsExist("1"); - } else { - vo.setIsExist("0"); - } - }); - } + List infoDOS = phoneRecordMapper.selectList(Wrappers.lambdaQuery().eq(PhoneRecordDO::getUserId, loginUser.getId())); + Map> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId)); + rechargeGearRespVOS.forEach(vo -> { + List infoDOS1 = collect.get(vo.getId()); + if (!CollectionUtils.isEmpty(infoDOS1)) { + vo.setIsExist("1"); + } else { + vo.setIsExist("0"); + } + }); return rechargeGearRespVOS; } @@ -130,21 +125,16 @@ public class RechargeGearServiceImpl implements RechargeGearService { List rechargeGearDOS = rechargeGearMapper.selectList(Wrappers.lambdaQuery() .eq(RechargeGearDO::getDeleted, 0)); List rechargeGearRespVOS = RechargeGearConvert.INSTANCE.convertList(rechargeGearDOS); - RechargeOrderDO orderDO = orderMapper.selectOne(Wrappers.lambdaQuery().eq(RechargeOrderDO::getUserPhone, phone) - .eq(RechargeOrderDO::getPaid,1) - .last("LIMIT 1")); - if (Objects.nonNull(orderDO)) { - List infoDOS = phoneRecordMapper.selectList(Wrappers.lambdaQuery().eq(PhoneRecordDO::getRechargeOrderId, orderDO.getId())); - Map> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId)); - rechargeGearRespVOS.forEach(vo -> { - List infoDOS1 = collect.get(vo.getId()); - if (!CollectionUtils.isEmpty(infoDOS1)) { - vo.setIsExist("1"); - } else { - vo.setIsExist("0"); - } - }); - } + List infoDOS = phoneRecordMapper.selectList(Wrappers.lambdaQuery().eq(PhoneRecordDO::getPhone, phone)); + Map> collect = infoDOS.stream().collect(Collectors.groupingBy(PhoneRecordDO::getRechargeGearId)); + rechargeGearRespVOS.forEach(vo -> { + List infoDOS1 = collect.get(vo.getId()); + if (!CollectionUtils.isEmpty(infoDOS1)) { + vo.setIsExist("1"); + } else { + vo.setIsExist("0"); + } + }); return rechargeGearRespVOS; } From 3c2eca8fba20b9a0c18d7a1d9b2a06998895112a Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Tue, 23 May 2023 11:26:48 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/resources/mapper/recharge/RechargeOrderMapper.xml | 1 + yudao-server/src/main/resources/application-prod.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml index d4b6e789e..840d91eeb 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml @@ -33,6 +33,7 @@ left join system_dept d on d.id = a.dept_id + order by a.pay_time desc