From 89c2d93a42be8bc4d1d1fdbfb76d8d1ed53eb1a1 Mon Sep 17 00:00:00 2001 From: TianYu <332368756@qq.com> Date: Fri, 26 May 2023 11:32:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=94=AF=E4=BB=98=E6=96=B9=E6=B3=95?= =?UTF-8?q?=E7=BB=9F=E4=B8=80=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/paymentMember/index.vue | 126 +++--------------- yudao-ui-app/libs/pay.js | 91 +++++++++++++ yudao-ui-app/static/images/mallLogo.png | Bin 34916 -> 2252 bytes 3 files changed, 107 insertions(+), 110 deletions(-) create mode 100644 yudao-ui-app/libs/pay.js diff --git a/yudao-ui-app/components/paymentMember/index.vue b/yudao-ui-app/components/paymentMember/index.vue index a55247b9c..615bf0643 100644 --- a/yudao-ui-app/components/paymentMember/index.vue +++ b/yudao-ui-app/components/paymentMember/index.vue @@ -20,8 +20,7 @@ - @@ -38,6 +37,7 @@ wechatOrderPay, wechatQueryPayResult } from '@/api/order.js'; + import uniPay from '@/libs/pay.js' import { memberTopUp } from '@/api/member.js'; @@ -82,126 +82,32 @@ 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(); - }, close: function() { this.$emit('onChangeFun', { action: 'payClose' }); }, // 微信支付JSAPI调起 - wxPayJSAPI(payData) { - function onBridgeReady() { - WeixinJSBridge.invoke('getBrandWCPayRequest', { - "appId": payData.appId, //公众号ID，由商户传入 - "timeStamp": payData.timeStamp, //时间戳，自1970年以来的秒数 - "nonceStr": payData.nonceStr, //随机串 - "package": payData.packageValue, - "signType": payData.signType, //微信签名方式： - "paySign": payData.paySign //微信签名 - }, - function(res) { - if (res.err_msg == "get_brand_wcpay_request:ok") { - window.location.reload() - // uni.switchTab({ - // url: '/pages/member_application/index' - // }) - } - }) - } - if (typeof WeixinJSBridge == "undefined") { - if (document.addEventListener) { - document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false) - } else if (document.attachEvent) { - document.attachEvent('WeixinJSBridgeReady', onBridgeReady) - document.attachEvent('onWeixinJSBridgeReady', onBridgeReady) - } - } else { - onBridgeReady() - } - }, + goPay: function(paytype) { let that = this; if (that.payInfo.orderInfos.length === 0) return that.$util.Tips({ title: '请选择要支付的订单' }); - uni.showLoading({ - title: '支付中', - mask: true - }); - if(paytype === 'WXPAY' && that.openId) { - that.payInfo.openid = that.openId - - } else if(paytype === 'WXPAY' && !that.openId){ - return that.$util.Tips({ - title: '请在微信客户端进行支付操作' - }); - } - memberTopUp({ - ...that.payInfo, - payType: paytype - }).then(res => { - let jsConfig = res.data - switch (paytype) { - case 'WXPAY': - uni.hideLoading(); - that.wxPayJSAPI(jsConfig.jsapiResult) - break; - case 'ALIPAY': - uni.hideLoading(); - this.alipayLink = jsConfig.body - // this._copy(jsConfig.body) - setTimeout(()=>{ - document.querySelector(".clipboard").click(); - this.alipayShow = true - }, 500) - // const div = document.createElement('div') - // /* 下面的data.content就是后台返回接收到的数据 */ - // div.innerHTML = jsConfig.body - // document.body.appendChild(div) - // document.forms[0].submit() - break; - case 'weixinh5': - uni.hideLoading(); - location.replace(jsConfig.mwebUrl + '&redirect_url=' + window.location.protocol + - '//' + window.location.host + goPages + '&status=1'); - return that.$util.Tips({ - title: "支付中", - icon: 'success' - }, () => { - that.$emit('onChangeFun', { - action: 'pay_complete' - }); - }); - break; + uniPay({ + payInfo: that.payInfo, + payType: paytype, + createOrderFun: memberTopUp, + wxPaySuccess: () => { + window.location.reload() + }, + aliPaySuccess: (link) => { + that.alipayLink = link + setTimeout(() => { + document.querySelector(".clipboard").click(); + that.alipayShow = true + }, 500) } - }).catch(err => { - uni.hideLoading(); - return that.$util.Tips({ - title: err - }, () => { - that.$emit('onChangeFun', { - action: 'pay_fail' - }); - }); }) } } diff --git a/yudao-ui-app/libs/pay.js b/yudao-ui-app/libs/pay.js new file mode 100644 index 000000000..9b9554783 --- /dev/null +++ b/yudao-ui-app/libs/pay.js @@ -0,0 +1,91 @@ +import util from 'utils/util' +import store from '@/store' + +const payTypes = ['WXPAY', 'ALIPAY'] +/** + * 统一支付处理方法 + * @param payInfo // 支付下单信息 + * @param payType // 支付类型 + * @param createOrderFun // 预下单方法 + * @param wxPaySuccess // 微信支付成功回调 + * @param aliPaySuccess // 支付宝支付成功回调 + */ +const unityPay = (options) => { + let _options = { + payInfo: {}, + payType: '', + createOrderFun: () => {}, + wxPaySuccess: () => {}, + aliPaySuccess: () => {} + } + Object.assign(_options, options) + if (!_options.payType) { + return util.Tips({ + title: '请选择支付方式' + }) + } + if (!payTypes.includes(_options.payType)) { + throw new Error('支付方式参数值为 WXPAY、ALIPAY') + } + // 目前微信只支持JSAPI，h5支付开通后取消该验证 + const openId = store.state.app.openId || '' + if (_options.payType === 'WXPAY' && !openId) { + return util.Tips({ + title: '请在微信客户端进行支付操作' + }) + } + _options.payInfo.openid = openId + uni.showLoading({ + title: '支付中', + mask: true + }) + _options.createOrderFun({ + ..._options.payInfo, + payType: _options.payType + }).then(res => { + const payConfig = res.data + switch (_options.payType) { + // 微信JSAPI支付 + case 'WXPAY': + wxPayJSAPI(payConfig.jsapiResult) + break + case 'ALIPAY': + _options.aliPaySuccess(payConfig.body) + break + } + }).catch(() => { + util.Tips({ + title: '预下单失败' + }) + }).finally(uni.hideLoading) +} + +const wxPayJSAPI = (payData) => { + function onBridgeReady() { + WeixinJSBridge.invoke('getBrandWCPayRequest', { + "appId": payData.appId, //公众号ID，由商户传入 + "timeStamp": payData.timeStamp, //时间戳，自1970年以来的秒数 + "nonceStr": payData.nonceStr, //随机串 + "package": payData.packageValue, + "signType": payData.signType, //微信签名方式： + "paySign": payData.paySign //微信签名 + }, + function(res) { + if (res.err_msg == "get_brand_wcpay_request:ok") { + _options.wxPaySuccess() + } + }) + } + if (typeof WeixinJSBridge == "undefined") { + if (document.addEventListener) { + document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false) + } else if (document.attachEvent) { + document.attachEvent('WeixinJSBridgeReady', onBridgeReady) + document.attachEvent('onWeixinJSBridgeReady', onBridgeReady) + } + } else { + onBridgeReady() + } +} + +export default unityPay diff --git a/yudao-ui-app/static/images/mallLogo.png b/yudao-ui-app/static/images/mallLogo.png index 65c18a6efdd07994c713d1dcfd2da0c04bfcedd0..303ffdf7ddf0f2765df4e90a09d768c234535ede 100644 GIT binary patch literal 2252 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

D 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 Date: Fri, 26 May 2023 11:53:18 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- yudao-ui-app/libs/pay.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yudao-ui-app/libs/pay.js b/yudao-ui-app/libs/pay.js index 9b9554783..a6635551f 100644 --- a/yudao-ui-app/libs/pay.js +++ b/yudao-ui-app/libs/pay.js @@ -7,8 +7,8 @@ const payTypes = ['WXPAY', 'ALIPAY'] * @param payInfo // 支付下单信息 * @param payType // 支付类型 * @param createOrderFun // 预下单方法 - * @param wxPaySuccess // 微信支付成功回调 - * @param aliPaySuccess // 支付宝支付成功回调 + * @param wxPaySuccess // 微信支付下单支付成功回调 + * @param aliPaySuccess // 支付宝支付下单成功回调 */ const unityPay = (options) => { let _options = { From 3303efa85efe8670c19ccedda97506271ceded3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B0=8F=E5=B0=8F=E5=BC=A0?= <1085577365@qq.com> Date: Fri, 26 May 2023 12:00:26 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0--=E8=BF=90=E8=B4=B9?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=9A=E9=85=8D=E9=80=81=E5=8C=BA=E5=9F=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../express/ShippingTemplatesController.java | 6 ++--- .../ShippingTemplatesFreeController.java | 2 +- ...ShippingTemplatesNoDeliveryController.java | 2 +- .../ShippingTemplatesRegionController.java | 2 +- .../express/ShippingTemplatesDO.java | 2 +- .../express/ShippingTemplatesFreeDO.java | 4 +-- .../ShippingTemplatesNoDeliveryDO.java | 4 +-- .../express/ShippingTemplatesRegionDO.java | 4 +-- .../express/ShippingTemplatesFreeMapper.java | 2 +- .../ShippingTemplatesNoDeliveryMapper.java | 2 +- .../ShippingTemplatesRegionMapper.java | 2 +- .../express/ShippingTemplatesFreeService.java | 8 +++--- .../ShippingTemplatesNoDeliveryService.java | 8 +++--- .../ShippingTemplatesRegionService.java | 8 +++--- .../express/ShippingTemplatesService.java | 6 ++--- .../ShippingTemplatesFreeServiceImpl.java | 15 ++++++----- ...hippingTemplatesNoDeliveryServiceImpl.java | 8 +++--- .../ShippingTemplatesRegionServiceImpl.java | 14 +++++------ .../impl/ShippingTemplatesServiceImpl.java | 6 ++--- .../service/order/impl/OrderServiceImpl.java | 25 ++++++++++--------- .../express/ShippingTemplatesFreeMapper.xml | 2 +- .../ShippingTemplatesNoDeliveryMapper.xml | 2 +- .../express/ShippingTemplatesRegionMapper.xml | 2 +- 23 files changed, 68 insertions(+), 68 deletions(-) diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java index 41d6eb02c..6ebf045e5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesController.java @@ -74,7 +74,7 @@ public class ShippingTemplatesController { @Operation(summary = "删除") @RequestMapping(value = "/delete", method = RequestMethod.GET) @Parameter(name="id", description="模板ID", required = true) - public CommonResult delete(@RequestParam(value = "id") Integer id){ + public CommonResult delete(@RequestParam(value = "id") Long id){ if(shippingTemplatesService.remove(id)){ return success("删除成功"); }else{ @@ -90,7 +90,7 @@ public class ShippingTemplatesController { @PreAuthorize("@ss.hasPermission('admin:shipping:templates:update')") @Operation(summary = "修改") @RequestMapping(value = "/update", method = RequestMethod.POST) - public CommonResult update(@RequestParam Integer id, @RequestBody @Validated ShippingTemplatesReqVO request){ + public CommonResult update(@RequestParam Long id, @RequestBody @Validated ShippingTemplatesReqVO request){ if (shippingTemplatesService.update(id, request)) { return CommonResult.success("修改成功"); } @@ -105,7 +105,7 @@ public class ShippingTemplatesController { @Operation(summary = "详情") @RequestMapping(value = "/info", method = RequestMethod.GET) @Parameter(name="id", description="模板ID", required = true) - public CommonResult info(@RequestParam(value = "id") Integer id){ + public CommonResult info(@RequestParam(value = "id") Long id){ return CommonResult.success(shippingTemplatesService.getInfo(id)); } } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java index 7cfc4406d..b9ad6f7c9 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesFreeController.java @@ -43,7 +43,7 @@ public class ShippingTemplatesFreeController { @PreAuthorize("@ss.hasPermission('admin:shipping:templates:free:list')") @Operation(summary = "根据模板id查询数据") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@RequestParam Integer tempId){ + public CommonResult> getList(@RequestParam Long tempId){ return CommonResult.success(shippingTemplatesFreeService.getListGroup(tempId)); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java index 8af8816bc..cf71141e6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesNoDeliveryController.java @@ -43,7 +43,7 @@ public class ShippingTemplatesNoDeliveryController { @PreAuthorize("@ss.hasPermission('admin:shipping:templates:free:list')") @Operation(summary = "根据模板id查询数据") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@RequestParam Integer tempId){ + public CommonResult> getList(@RequestParam Long tempId){ return CommonResult.success(shippingTemplatesNoDeliveryService.getListGroup(tempId)); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java index 38644efd9..3e1c873c6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/express/ShippingTemplatesRegionController.java @@ -43,7 +43,7 @@ public class ShippingTemplatesRegionController { @PreAuthorize("@ss.hasPermission('admin:shipping:templates:region:list')") @Operation(summary = "根据模板id查询数据") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult> getList(@RequestParam Integer tempId){ + public CommonResult> getList(@RequestParam Long tempId){ return CommonResult.success(shippingTemplatesRegionService.getListGroup(tempId)); } } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java index 8a38f241e..55c184313 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesDO.java @@ -29,7 +29,7 @@ public class ShippingTemplatesDO extends BaseDO { private static final long serialVersionUID=1L; @TableId(value = "id", type = IdType.ASSIGN_ID) - private Integer id; + private Long id; /** *模板名称 diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java index eee0c694c..5f8df0866 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesFreeDO.java @@ -31,12 +31,12 @@ public class ShippingTemplatesFreeDO implements Serializable { private static final long serialVersionUID=1L; @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 模板ID */ - private Integer tempId; + private Long tempId; private Integer provinceId; diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java index 7790300b3..3699315d9 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesNoDeliveryDO.java @@ -30,12 +30,12 @@ public class ShippingTemplatesNoDeliveryDO implements Serializable { private static final long serialVersionUID=1L; @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 模板ID */ - private Integer tempId; + private Long tempId; /** *城市ID diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java index 17b544165..eaae338ab 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/dataobject/express/ShippingTemplatesRegionDO.java @@ -31,12 +31,12 @@ public class ShippingTemplatesRegionDO implements Serializable { private static final long serialVersionUID=1L; @TableId(value = "id", type = IdType.AUTO) - private Integer id; + private Long id; /** * 模板ID */ - private Integer tempId; + private Long tempId; /** *城市ID diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java index bbb40e3eb..37dc7e802 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesFreeMapper.java @@ -22,5 +22,5 @@ import java.util.List; @Mapper public interface ShippingTemplatesFreeMapper extends BaseMapperX { - List getListGroup(Integer tempId); + List getListGroup(Long tempId); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java index 1713de8cd..5b4b5c610 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesNoDeliveryMapper.java @@ -22,6 +22,6 @@ import java.util.List; @Mapper public interface ShippingTemplatesNoDeliveryMapper extends BaseMapperX { - List getList(Integer tempId); + List getList(Long tempId); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java index 3beeed1bd..c730ec7e6 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/dal/mysql/express/ShippingTemplatesRegionMapper.java @@ -22,5 +22,5 @@ import java.util.List; @Mapper public interface ShippingTemplatesRegionMapper extends BaseMapperX { - List getListGroup(Integer tempId); + List getListGroup(Long tempId); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java index dc99df313..a782b28a5 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/ShippingTemplatesFreeService.java @@ -24,15 +24,15 @@ import java.util.List; @Validated public interface ShippingTemplatesFreeService extends IService { - void saveAll(List shippingTemplatesFreeRespVOList, Integer type, Integer id); + void saveAll(List shippingTemplatesFreeRespVOList, Integer type, Long id); - List getListGroup(Integer tempId); + List getListGroup(Long tempId); /** * 删除 * @param tempId 运费模板id */ - Boolean delete(Integer tempId); + Boolean delete(Long tempId); /** * 根据模板编号、城市ID查询 @@ -40,5 +40,5 @@ public interface ShippingTemplatesFreeService extends IService { - void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesFreeRespVOList, Integer id); + void saveAll(ShippingTemplatesNoDeliveryRespVO shippingTemplatesFreeRespVOList, Long id); - List getListGroup(Integer tempId); + List getListGroup(Long tempId); /** * 根据模板编号、城市ID查询 @@ -35,7 +35,7 @@ public interface ShippingTemplatesNoDeliveryService extends IService { - void saveAll(List shippingTemplatesRegionRespVOList, Integer type, Integer id); + void saveAll(List shippingTemplatesRegionRespVOList, Integer type, Long id); - List getListGroup(Integer tempId); + List getListGroup(Long tempId); /** * 删除 * @param tempId 运费模板id * @return Boolean */ - Boolean delete(Integer tempId); + Boolean delete(Long tempId); /** * 根据模板编号、城市ID查询 @@ -42,5 +42,5 @@ public interface ShippingTemplatesRegionService extends IService */ Boolean create(ShippingTemplatesReqVO request); - Boolean update(Integer id, ShippingTemplatesReqVO request); + Boolean update(Long id, ShippingTemplatesReqVO request); /** * 删除模板 * @param id 模板id * @return Boolean */ - Boolean remove(Integer id); + Boolean remove(Long id); /** * 获取模板信息 * @param id 模板id * @return ShippingTemplates */ - ShippingTemplatesDO getInfo(Integer id); + ShippingTemplatesDO getInfo(Long id); } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java index 9082dca02..4a536a9f8 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesFreeServiceImpl.java @@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.shop.service.express.ShippingTemplatesFreeService import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.apache.commons.codec.digest.DigestUtils; -import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -48,9 +47,8 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl shippingTemplatesFreeRespVOList, Integer type, Integer tempId) { + public void saveAll(List shippingTemplatesFreeRespVOList, Integer type, Long tempId) { ArrayList shippingTemplatesFreesListDO = new ArrayList<>(); @@ -82,6 +80,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId); @@ -119,7 +118,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId); return dao.delete(lambdaQueryWrapper) > 0; @@ -129,7 +128,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getTempId, tempId); lambdaQueryWrapper.eq(ShippingTemplatesFreeDO::getStatus, false); @@ -143,7 +142,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(ShippingTemplatesFreeDO::getTempId, tempId); lqw.eq(ShippingTemplatesFreeDO::getCityId, cityId); @@ -159,7 +158,7 @@ public class ShippingTemplatesFreeServiceImpl extends ServiceImpl */ @Override - public List getListGroup(Integer tempId) { + public List getListGroup(Long tempId) { return dao.getListGroup(tempId); } } diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java index 6f32d1d9c..9ac009c18 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesNoDeliveryServiceImpl.java @@ -37,7 +37,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl shippingTemplatesNoDeliveryDOS = new ArrayList<>(); delete(tempId); @@ -64,7 +64,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesNoDeliveryDO::getTempId, tempId); return shippingTemplatesNoDeliveryMapper.delete(lambdaQueryWrapper) > 0; @@ -92,7 +92,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl */ @Override - public List getListGroup(Integer tempId) { + public List getListGroup(Long tempId) { return shippingTemplatesNoDeliveryMapper.getList(tempId); } @@ -103,7 +103,7 @@ public class ShippingTemplatesNoDeliveryServiceImpl extends ServiceImpl lqw = new LambdaQueryWrapper<>(); lqw.eq(ShippingTemplatesNoDeliveryDO::getTempId, tempId); lqw.eq(ShippingTemplatesNoDeliveryDO::getCityId, cityId); diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java index 3654cc64c..b097ee8dd 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesRegionServiceImpl.java @@ -59,9 +59,8 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl shippingTemplatesRegionRespVOList, Integer type, Integer tempId) { + public void saveAll(List shippingTemplatesRegionRespVOList, Integer type, Long tempId) { ArrayList shippingTemplatesRegionDOList = new ArrayList<>(); //把目前模板下的所有数据标记为无效 @@ -95,6 +94,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId); @@ -134,7 +134,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getStatus, false); @@ -148,7 +148,7 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getCityId, cityId); @@ -163,12 +163,12 @@ public class ShippingTemplatesRegionServiceImpl extends ServiceImpl */ @Override - public List getListGroup(Integer tempId) { + public List getListGroup(Long tempId) { return dao.getListGroup(tempId); } @Override - public Boolean delete(Integer tempId) { + public Boolean delete(Long tempId) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(ShippingTemplatesRegionDO::getTempId, tempId); return dao.delete(lambdaQueryWrapper) > 0; diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java index 2a0984795..7b2d86a3d 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/service/express/impl/ShippingTemplatesServiceImpl.java @@ -146,7 +146,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl { shippingTemplatesRegionService.delete(id); shippingTemplatesFreeService.delete(id); @@ -200,7 +200,7 @@ public class ShippingTemplatesServiceImpl extends ServiceImpl m : proMap.entrySet()) { MyRecord value = m.getValue(); - Integer tempId = value.getInt("tempId"); + Long tempId = value.getLong("tempId"); ShippingTemplatesDO shippingTemplatesDO = shippingTemplatesApi.getById(tempId); if (shippingTemplatesDO.getAppoint()) {// 指定包邮 // 判断是否在指定包邮区域内 diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml index 818c5057c..a49c12531 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesFreeMapper.xml @@ -2,7 +2,7 @@ - SELECT city_id, province_id, title, `number`, price, uniqid FROM diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml index 6b042f88e..856d423e4 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesNoDeliveryMapper.xml @@ -2,7 +2,7 @@ - SELECT city_id, province_id, title, uniqid FROM diff --git a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml index c984f8d77..3cb6e86ad 100644 --- a/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml +++ b/yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/express/ShippingTemplatesRegionMapper.xml @@ -2,7 +2,7 @@ - SELECT city_id, province_id, `first`, first_price, title, `renewal`, renewal_price, uniqid FROM From 23560dc45e3269ce79ed4092f6aecd996fb08f12 Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 13:19:18 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?= 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 87f3a7fa6..0b9da0c0b 100644 --- a/yudao-server/src/main/resources/application-prod.yaml +++ b/yudao-server/src/main/resources/application-prod.yaml @@ -240,5 +240,5 @@ wx: database: 16 # 数据库索引 password: 20221122@dev # 密码，建议生产环境开启 phone: - query-url: http://cy-phone-bill-inquiry-server:4006/cyywl-phone-query-api/ + query-url: http://192.168.1.94:4006/cyywl-phone-query-api/ token: eyIwLnR5cCI6IkpXVCIsImFsZyI6IkhTNTEyIn0 \ No newline at end of file From e14b6608ef5ddb9baf828680a6814b9eaf95ab1a Mon Sep 17 00:00:00 2001 From: perry <292303709@qq.com> Date: Fri, 26 May 2023 13:45:46 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/member/service/promoter/PromoterServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java index a0b8708ec..ba044b319 100644 --- a/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java +++ b/yudao-module-member/yudao-module-member-biz/src/main/java/cn/iocoder/yudao/module/member/service/promoter/PromoterServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.common.util.validation.ValidationUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; +import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder; import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO; import cn.iocoder.yudao.module.member.enums.ErrorCodeConstants; import cn.iocoder.yudao.module.member.service.user.MemberUserService; @@ -71,11 +72,11 @@ public class PromoterServiceImpl implements PromoterService { memberUserDO.setMobile(createReqVO.getMobile()); memberUserDO.setStatus(createReqVO.getStatus()); memberUserDO.setPassword(createReqVO.getMobile().substring(createReqVO.getMobile().length() - 6)); - memberUserService.createUserIfAbsent(createReqVO.getMobile(), createReqVO.getNickname(), getClientIP()); + memberUserDO = memberUserService.createUserIfAbsent(createReqVO.getMobile(), createReqVO.getNickname(), getClientIP()); } // 插入 PromoterDO promoter = PromoterConvert.INSTANCE.convert(createReqVO); - promoter.setTenantId(SecurityFrameworkUtils.getLoginUser().getTenantId()); + promoter.setTenantId(TenantContextHolder.getTenantId()); Long count = promoterMapper.selectCount(Wrappers.lambdaQuery(PromoterDO.class).eq(PromoterDO::getUserId, memberUserDO.getId())); if (count > 0) { throw new ServiceException(PROMOTER_EXISTS);