From b2c79638549606dbd664977018e2f0f650450d59 Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Wed, 15 Jan 2025 16:39:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=9F=9F=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/ordorder/OrdOrderService.java | 32 +++++++++---------- .../biz/refundorder/RefundOrderService.java | 6 ++-- src/main/resources/application-pro.yml | 10 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java b/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java index 31b7eb2..d5755a6 100644 --- a/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java +++ b/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java @@ -53,9 +53,9 @@ import java.util.stream.Collectors; @Service public class OrdOrderService extends MybatisBaseService { - private static final String OrderUrl = "https://supervise.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid="; - private static final String or = "https://supervise.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid="; - private static final String payUrl = "https://supervise.yxtsoft.com/lpkapi/order/getPreOrder"; + private static final String OrderUrl = "https://nhx.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid="; + private static final String or = "https://nhx.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid="; + private static final String payUrl = "https://nhx.yxtsoft.com/lpkapi/order/getPreOrder"; @Autowired OrdOrderDetailService ordOrderDetailsService; @Autowired @@ -90,7 +90,7 @@ public class OrdOrderService extends MybatisBaseService map = new HashMap<>(); LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); Map sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), OrderUrl); - ResponseEntity postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); + ResponseEntity postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); @@ -142,7 +142,7 @@ public class OrdOrderService extends MybatisBaseService map = new HashMap<>(); LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); Map sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), or); - ResponseEntity postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); + ResponseEntity postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); @@ -258,7 +258,7 @@ public class OrdOrderService extends MybatisBaseService map = new HashMap<>(); LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); Map sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), or); - ResponseEntity postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); + ResponseEntity postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); @@ -367,7 +367,7 @@ public class OrdOrderService extends MybatisBaseService sendBody=buildMessageBody(orderDetail,dto.getReason()); - ResponseEntity postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/refund/createRefundOrder", sendBody, ResultBean.class); + ResponseEntity postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/refund/createRefundOrder", sendBody, ResultBean.class); // ResponseEntity postForEntity = new RestTemplate().postForEntity("http://192.168.0.105:7777/refund/createRefundOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); @@ -109,7 +109,7 @@ public class RefundOrderService extends MybatisBaseService refundResponse = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/refund/reviewRefund?orderSid="+orderDetail.getMainSid(), sendBody, ResultBean.class); + ResponseEntity refundResponse = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/refund/reviewRefund?orderSid="+orderDetail.getMainSid(), sendBody, ResultBean.class); // ResponseEntity refundResponse = new RestTemplate().postForEntity("http://192.168.0.105:7777/refund/reviewRefund?orderSid="+orderDetail.getMainSid(), sendBody, ResultBean.class); if(refundResponse.getBody().getCode().equals("200")){ //该订单状态 @@ -184,7 +184,7 @@ public class RefundOrderService extends MybatisBaseService