From addcb683f354a4ebeaae93be9cf8bd4aaeac006b Mon Sep 17 00:00:00 2001 From: hupeng Date: Sun, 15 Dec 2019 21:19:41 +0800 Subject: [PATCH] =?UTF-8?q?1.4.5=20bug=E4=BF=AE=E5=A4=8D=E7=89=88=E6=9C=AC?= =?UTF-8?q?=EF=BC=9A=E4=BF=AE=E5=A4=8D=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E4=BC=98=E6=83=A0=E5=88=B8=E4=B8=8D=E6=98=BE=E7=A4=BA,?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=8E=E5=8F=B0=E5=8F=91=E8=B4=A7=E4=B8=8E?= =?UTF-8?q?=E9=80=80=E6=AC=BE=E5=88=A4=E6=96=AD=E5=86=B2=E7=AA=81,?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=87=BA=E7=8E=B0=E6=95=85=E9=9A=9C?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 9 ++++--- .../order/service/YxStoreOrderService.java | 2 ++ .../service/impl/YxStoreOrderServiceImpl.java | 27 +++++++++++++++++++ .../web/controller/StoreOrderController.java | 3 ++- .../resources/config/application-prod.yml | 2 +- .../main/java/co/yixiang/utils/OrderUtil.java | 2 +- .../yixiang/mp/config/WxMpConfiguration.java | 2 +- .../co/yixiang/mp/handler/MsgHandler.java | 3 +-- .../modules/shop/domain/YxStoreOrder.java | 4 +-- .../shop/rest/YxStoreOrderController.java | 3 ++- 10 files changed, 44 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 726a254b..7f2c8224 100644 --- a/README.md +++ b/README.md @@ -143,13 +143,14 @@ yshop基于当前流行技术组合的前后端分离商城系统： SpringBoot2 - 1.8、修复新增配置数据有时候不成功问题等 - 1.4.1个人中心新增账单流水 - yshop1.4.2 发布更新如下： - -1.商品新增多图评价 - -2.订单新增快递查询 --1.4.3版本，后台图标更新,后台模块重新拆分,物流快递单独管理,导出最新sql + - 1.商品新增多图评价 + - 2.订单新增快递查询 +- 1.4.3版本，后台图标更新,后台模块重新拆分,物流快递单独管理,导出最新sql +- 1.4.4版本，新增模板消息通知、H5端商家管理发货修改及其列表时间显示修复 #### 反馈交流 -- QQ交流群：907721261 +- QQ交流群：964166879 - 喜欢这个商城后台的小伙伴留下你的小星星啦,star,star哦！ #### 特别鸣谢 diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java index 41c1ec1c..e4ce7fbd 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/YxStoreOrderService.java @@ -81,6 +81,8 @@ public interface YxStoreOrderService extends BaseService { WxPayMpOrderResult wxPay(String orderId) throws WxPayException; + String aliPay(String orderId) throws Exception; + void delCacheOrderInfo(int uid, String key); YxStoreOrder createOrder(int uid, String key, OrderParam param); diff --git a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java index 822b80f8..2d9c4769 100644 --- a/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-api/src/main/java/co/yixiang/modules/order/service/impl/YxStoreOrderServiceImpl.java @@ -3,6 +3,8 @@ package co.yixiang.modules.order.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.*; import co.yixiang.common.constant.CommonConstant; +import co.yixiang.domain.AlipayConfig; +import co.yixiang.domain.vo.TradeVo; import co.yixiang.exception.ErrorRequestException; import co.yixiang.modules.activity.service.YxStoreCombinationService; import co.yixiang.modules.activity.service.YxStorePinkService; @@ -50,6 +52,7 @@ import co.yixiang.modules.user.web.vo.YxWechatUserQueryVo; import co.yixiang.modules.wechat.entity.YxWechatTemplate; import co.yixiang.mp.service.WxMpTemplateMessageService; import co.yixiang.modules.wechat.service.YxWechatTemplateService; +import co.yixiang.service.AlipayService; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; import com.alibaba.fastjson.JSON; @@ -159,6 +162,9 @@ public class YxStoreOrderServiceImpl extends BaseServiceImpl context, WxMpService weixinService, WxSessionManager sessionManager) { - this.logger.info("hupeng"); if (!wxMessage.getMsgType().equals(XmlMsgType.EVENT)) { //TODO 可以选择将消息保存到本地 } @@ -41,7 +40,7 @@ public class MsgHandler extends AbstractHandler { } //TODO 组装回复消息 - String content = "收到信息内容：" + JsonUtils.toJson(wxMessage); + String content = "yshop收到信息内容：" + wxMessage.getContent(); return new TextBuilder().build(content, wxMessage, weixinService); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java index 49630634..93e49fa0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java @@ -133,7 +133,7 @@ public class YxStoreOrder implements Serializable { // 快递名称/送货人姓名 @Column(name = "delivery_name") - @NotBlank(message = "请选择快递公司") + //@NotBlank(message = "请选择快递公司") private String deliveryName; @Column(name = "delivery_sn") @@ -146,7 +146,7 @@ public class YxStoreOrder implements Serializable { // 快递单号/手机号 @Column(name = "delivery_id") - @NotBlank(message = "快递单号不能为空") + //@NotBlank(message = "快递单号不能为空") private String deliveryId; // 消费赚取积分 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java index 6f23a00a..d38ff239 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxStoreOrderController.java @@ -139,7 +139,8 @@ public class YxStoreOrderController { @PutMapping(value = "/yxStoreOrder") @PreAuthorize("hasAnyRole('ADMIN','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreOrder resources){ - + if(StrUtil.isBlank(resources.getDeliveryName())) throw new BadRequestException("请选择快递公司"); + if(StrUtil.isBlank(resources.getDeliveryId())) throw new BadRequestException("快递单号不能为空"); YxExpressDTO expressDTO = yxExpressService.findById(Integer.valueOf(resources .getDeliveryName())); if(ObjectUtil.isNull(expressDTO)){