From 264ce2501f4f98d23dce8516c6b72bc41bd89d4b Mon Sep 17 00:00:00 2001 From: wangpengfei <1928057482@qq.com> Date: Thu, 6 Feb 2025 14:16:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz/lpkcustomer/LpkCustomerService.java | 10 ++-- .../yythmall/biz/lpkcustomer/WxResult.java | 15 ++++++ .../biz/ordorder/OrdOrderService.java | 52 ++++++++++--------- .../biz/refundorder/RefundOrderService.java | 12 +++-- 4 files changed, 56 insertions(+), 33 deletions(-) create mode 100644 src/main/java/com/yxt/yythmall/biz/lpkcustomer/WxResult.java diff --git a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java index f9112b8..76900c6 100644 --- a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java +++ b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java @@ -90,10 +90,14 @@ public class LpkCustomerService extends MybatisBaseService map = new HashMap<>(); map.put("unionid",unionid); diff --git a/src/main/java/com/yxt/yythmall/biz/lpkcustomer/WxResult.java b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/WxResult.java new file mode 100644 index 0000000..89f950e --- /dev/null +++ b/src/main/java/com/yxt/yythmall/biz/lpkcustomer/WxResult.java @@ -0,0 +1,15 @@ + +package com.yxt.yythmall.biz.lpkcustomer; + +import lombok.Data; + +/** + * @author wangpengfei + * @date 2024/12/16 11:00 + */ +@Data +public class WxResult { + private String unionid; + private String openid; + private String session_key; +} 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 d1dd7cf..92c89e0 100644 --- a/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java +++ b/src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java @@ -52,10 +52,11 @@ 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/empsreservoorder/getPreOrder"; +// @Value("${weixin.url}") + private static String url="https://ordermall.yxtsoft.com/ycjapi/"; + private static final String OrderUrl = "empcardgift/generateTopEmpCard?mainSid="; + private static final String or = "vegetablecellar/addGoods?mainSid="; + private static final String payUrl ="empsreservoorder/getPreOrder"; @Autowired OrdOrderDetailService ordOrderDetailsService; @Autowired @@ -78,7 +79,8 @@ 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); + Map sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), url+OrderUrl); + ResponseEntity postForEntity = new RestTemplate().postForEntity(payUrl1+"order/createOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); @@ -116,7 +118,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); + Map sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), url+or); + ResponseEntity postForEntity = new RestTemplate().postForEntity(payUrl1+"order/createOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); @@ -230,7 +232,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); + Map sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), url+or); + ResponseEntity postForEntity = new RestTemplate().postForEntity(payUrl1+"order/createOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); @@ -343,7 +345,7 @@ public class OrdOrderService extends MybatisBaseService ordOrders = new ArrayList<>(); dto.getOrdOrderDetailsVoList().forEach(s -> { @@ -367,7 +369,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("http://192.168.0.105:7777/refund/createRefundOrder", sendBody, ResultBean.class); + ResponseEntity postForEntity = new RestTemplate().postForEntity(payUrl+"refund/createRefundOrder", sendBody, ResultBean.class); +// ResponseEntity postForEntity = new RestTemplate().postForEntity("http://192.168.0.105:7778/refund/createRefundOrder", sendBody, ResultBean.class); ResultBean rb1 = postForEntity.getBody(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); if (!rb1.getCode().equals("200")) { @@ -109,7 +111,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(payUrl+"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 +186,7 @@ public class RefundOrderService extends MybatisBaseService