diff --git a/ruoyi-admin/src/main/resources/application-druid-root.yml b/ruoyi-admin/src/main/resources/application-druid-root.yml index 6695d11..892f5d3 100644 --- a/ruoyi-admin/src/main/resources/application-druid-root.yml +++ b/ruoyi-admin/src/main/resources/application-druid-root.yml @@ -67,10 +67,10 @@ wechat: apiV2key: 19961022196901121965060120230731 # notifyUrl: https://api.catmdogd.com/prod-api/no-auth/wechat/notify # notifyUrlForBCHSH: https://api.catmdogd.com/prod-api/no-auth/wechat/notifyForBCHSH - notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify - notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH -# notifyUrl: http://h5.xzaiyp.top/no-auth/wechat/notify -# notifyUrlForBCHSH: http://h5.xzaiyp.top/no-auth/wechat/notifyForBCHSH +# notifyUrl: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notify +# notifyUrlForBCHSH: https://pet-admin.hhlm1688.com/api/no-auth/wechat/notifyForBCHSH + notifyUrl: http://h5.xzaiyp.top/no-auth/wechat/notify + notifyUrlForBCHSH: http://h5.xzaiyp.top/no-auth/wechat/notifyForBCHSH miniProgramAppId: wxd1a6ba7b5e17a5b6 miniProgramSecret: 06e946a2c9010f8eb9e306018a779a7f staffAppId: wx01f0f43759922fda @@ -167,4 +167,4 @@ tencent: secretKey: cz96D9rPluvjKitrc9VfWSEqHWbUAh2D -payMangeDev: false \ No newline at end of file +payMangeDev: true \ No newline at end of file diff --git a/ruoyi-catdog/src/main/java/com/ruoyi/applet/tencent/TaskConsumer.java b/ruoyi-catdog/src/main/java/com/ruoyi/applet/tencent/TaskConsumer.java index c06b736..7b5dd8d 100644 --- a/ruoyi-catdog/src/main/java/com/ruoyi/applet/tencent/TaskConsumer.java +++ b/ruoyi-catdog/src/main/java/com/ruoyi/applet/tencent/TaskConsumer.java @@ -309,7 +309,9 @@ public class TaskConsumer implements QueueConsumer { //按照原订单进行接单 H5OrderVO oldOrder = h5OrderService.orderDetail(h5OrderVO.getOldOrderId()); - AliyunSmsUtils.sendNotifyOrderUpdate(oldOrder.getReceiverPhone()); + if (oldOrder != null){ + AliyunSmsUtils.sendNotifyOrderUpdate(oldOrder.getReceiverPhone()); + } if(oldOrder != null && oldOrder.getAcceptAppUserId() != null && oldOrder.getAcceptAppUserId() != 0){ @@ -382,13 +384,15 @@ public class TaskConsumer implements QueueConsumer { //TODO 短信通知 系统和接单的伴宠师 通知内容需要修改一下 AliyunSmsUtils.sendOrderUpdate(appUsers.getUserTelephone(), AliyunSmsUtils.UPDATE, omsOrder.getId() + ""); - AppletConfig appletConfig = appletConfigService.getByCode("admin_phone_list"); - String adminPhoneList = appletConfig.getParamValueText(); - if(StringUtils.isNotEmpty(adminPhoneList)){ - for (String phone : adminPhoneList.split(",")) { - AliyunSmsUtils.sendOrderUpdate(phone, AliyunSmsUtils.UPDATE, omsOrder.getId() + ""); - } + } + + AppletConfig appletConfig = appletConfigService.getByCode("admin_phone_list"); + + String adminPhoneList = appletConfig.getParamValueText(); + if(StringUtils.isNotEmpty(adminPhoneList)){ + for (String phone : adminPhoneList.split(",")) { + AliyunSmsUtils.sendOrderUpdate(phone, AliyunSmsUtils.UPDATE, omsOrder.getId() + ""); } } } diff --git a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java index f0f451a..98e3083 100644 --- a/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java +++ b/ruoyi-mall/src/main/java/com/cyl/h5/service/H5OrderService.java @@ -38,6 +38,7 @@ import com.cyl.manager.ums.domain.*; import com.cyl.manager.ums.mapper.MemberAddressMapper; import com.cyl.manager.ums.mapper.MemberCartMapper; import com.cyl.manager.ums.mapper.MemberWechatMapper; +import com.cyl.manager.ums.pojo.vo.MemberAddressVO; import com.cyl.manager.ums.pojo.vo.PetVO; import com.cyl.manager.ums.service.PetService; import com.cyl.tencent.OrderMessageModel; @@ -90,6 +91,9 @@ public class H5OrderService { @Autowired private MemberAddressMapper memberAddressMapper; + @Autowired + private H5MemberAddressService h5MemberAddressService; + @Autowired private SkuMapper skuMapper; @@ -189,6 +193,7 @@ public class H5OrderService { if (addressId == null){ throw new RuntimeException("地址不能为空"); } + MemberAddressVO addressVO = h5MemberAddressService.selectById(addressId); MemberAddress memberAddress = memberAddressMapper.selectById(addressId); if (memberAddress == null){ throw new RuntimeException("地址不能为空"); @@ -238,7 +243,7 @@ public class H5OrderService { order.setStatus(Constants.OrderStatus.NOTPAID); order.setAftersaleStatus(1); order.setReceiverName(memberAddress.getName()); - order.setReceiverPhone(memberAddress.getPhoneHidden()); + order.setReceiverPhone(addressVO.getPhone()); order.setReceiverPostCode(memberAddress.getPostCode()); order.setReceiverProvince(memberAddress.getProvince()); order.setReceiverCity(memberAddress.getCity());