yxt_group
/
hr_yuncaijiao_admin
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

更改域名

master
wangpengfei 5 months ago
parent
0e3c6aac92
commit
b2c7963854
3 changed files with 24 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 32
      src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java
  2. 6
      src/main/java/com/yxt/yythmall/biz/refundorder/RefundOrderService.java
  3. 10
      src/main/resources/application-pro.yml

32
src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java
View File

@ -53,9 +53,9 @@ import java.util.stream.Collectors;
@Service @Service
public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder> { public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder> {
private static final String OrderUrl = "https://supervise.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid="; private static final String OrderUrl = "https://nhx.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid=";
private static final String or = "https://supervise.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid="; private static final String or = "https://nhx.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid=";
private static final String payUrl = "https://supervise.yxtsoft.com/lpkapi/order/getPreOrder"; private static final String payUrl = "https://nhx.yxtsoft.com/lpkapi/order/getPreOrder";
@Autowired @Autowired
OrdOrderDetailService ordOrderDetailsService; OrdOrderDetailService ordOrderDetailsService;
@Autowired @Autowired
@ -90,7 +90,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData();
Map<String, Object> sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), OrderUrl); Map<String, Object> sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), OrderUrl);
ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class);
ResultBean<PayOrderVo> rb1 = postForEntity.getBody(); ResultBean<PayOrderVo> rb1 = postForEntity.getBody();
LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData();
@ -142,7 +142,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
result.setRemainder(String.valueOf(10 * 60)); result.setRemainder(String.valueOf(10 * 60));
PayUrl payUrl = new PayUrl(); PayUrl payUrl = new PayUrl();
payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay"); payUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/pay");
PayParams aVoid = new PayParams(); PayParams aVoid = new PayParams();
aVoid.setMainSid(rb2.get("mainSid").toString()); aVoid.setMainSid(rb2.get("mainSid").toString());
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
@ -153,7 +153,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
orderUrl.setParams(orderParams); orderUrl.setParams(orderParams);
TradeNoUrl tradeNoUrl = new TradeNoUrl(); TradeNoUrl tradeNoUrl = new TradeNoUrl();
tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery"); tradeNoUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/orderQuery");
TradeParams tradeParams = new TradeParams(); TradeParams tradeParams = new TradeParams();
tradeParams.setMainSid(rb2.get("mainSid").toString()); tradeParams.setMainSid(rb2.get("mainSid").toString());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);
@ -203,7 +203,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData();
Map<String, Object> sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), or); Map<String, Object> sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), or);
ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class);
ResultBean<PayOrderVo> rb1 = postForEntity.getBody(); ResultBean<PayOrderVo> rb1 = postForEntity.getBody();
LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData();
@ -258,7 +258,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
result.setRemainder(String.valueOf(10 * 60)); result.setRemainder(String.valueOf(10 * 60));
PayUrl payUrl = new PayUrl(); PayUrl payUrl = new PayUrl();
payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay"); payUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/pay");
PayParams aVoid = new PayParams(); PayParams aVoid = new PayParams();
aVoid.setMainSid(rb2.get("mainSid").toString()); aVoid.setMainSid(rb2.get("mainSid").toString());
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
@ -269,7 +269,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
orderUrl.setParams(orderParams); orderUrl.setParams(orderParams);
TradeNoUrl tradeNoUrl = new TradeNoUrl(); TradeNoUrl tradeNoUrl = new TradeNoUrl();
tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery"); tradeNoUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/orderQuery");
TradeParams tradeParams = new TradeParams(); TradeParams tradeParams = new TradeParams();
tradeParams.setMainSid(rb2.get("mainSid").toString()); tradeParams.setMainSid(rb2.get("mainSid").toString());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);
@ -316,7 +316,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData(); LpkCustomerVo vo = lpkCustomerService.getCustomerInfo(dto.getCustomerSid()).getData();
Map<String, Object> sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), or); Map<String, Object> sendBody = buildMessageBody(vo.getSid(), vo.getWxMpOpenid(), dto.getTotalTee(), dto.getOrdOrderDetailsVoList(), or);
ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class);
ResultBean<PayOrderVo> rb1 = postForEntity.getBody(); ResultBean<PayOrderVo> rb1 = postForEntity.getBody();
LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData();
@ -367,7 +367,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
result.setRemainder(String.valueOf(10 * 60)); result.setRemainder(String.valueOf(10 * 60));
PayUrl payUrl = new PayUrl(); PayUrl payUrl = new PayUrl();
payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay"); payUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/pay");
PayParams aVoid = new PayParams(); PayParams aVoid = new PayParams();
aVoid.setMainSid(rb2.get("mainSid").toString()); aVoid.setMainSid(rb2.get("mainSid").toString());
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
@ -378,7 +378,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
orderUrl.setParams(orderParams); orderUrl.setParams(orderParams);
TradeNoUrl tradeNoUrl = new TradeNoUrl(); TradeNoUrl tradeNoUrl = new TradeNoUrl();
tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery"); tradeNoUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/orderQuery");
TradeParams tradeParams = new TradeParams(); TradeParams tradeParams = new TradeParams();
tradeParams.setMainSid(rb2.get("mainSid").toString()); tradeParams.setMainSid(rb2.get("mainSid").toString());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);
@ -500,7 +500,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
result.setRemainder(String.valueOf(10 * 60)); result.setRemainder(String.valueOf(10 * 60));
PayUrl payUrl = new PayUrl(); PayUrl payUrl = new PayUrl();
payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay"); payUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/pay");
PayParams aVoid = new PayParams(); PayParams aVoid = new PayParams();
aVoid.setMainSid(pagging.getMainSid()); aVoid.setMainSid(pagging.getMainSid());
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
@ -511,7 +511,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
orderUrl.setParams(orderParams); orderUrl.setParams(orderParams);
TradeNoUrl tradeNoUrl = new TradeNoUrl(); TradeNoUrl tradeNoUrl = new TradeNoUrl();
tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery"); tradeNoUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/orderQuery");
TradeParams tradeParams = new TradeParams(); TradeParams tradeParams = new TradeParams();
tradeParams.setMainSid(pagging.getMainSid()); tradeParams.setMainSid(pagging.getMainSid());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);
@ -569,7 +569,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
result.setRemainder(String.valueOf(10 * 60)); result.setRemainder(String.valueOf(10 * 60));
PayUrl payUrl = new PayUrl(); PayUrl payUrl = new PayUrl();
payUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/pay"); payUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/pay");
PayParams aVoid = new PayParams(); PayParams aVoid = new PayParams();
aVoid.setMainSid(pagging.getMainSid()); aVoid.setMainSid(pagging.getMainSid());
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
@ -580,7 +580,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
orderUrl.setParams(orderParams); orderUrl.setParams(orderParams);
TradeNoUrl tradeNoUrl = new TradeNoUrl(); TradeNoUrl tradeNoUrl = new TradeNoUrl();
tradeNoUrl.setUrl("https://supervise.yxtsoft.com/wxPay/order/orderQuery"); tradeNoUrl.setUrl("https://nhx.yxtsoft.com/wxPay/order/orderQuery");
TradeParams tradeParams = new TradeParams(); TradeParams tradeParams = new TradeParams();
tradeParams.setMainSid(pagging.getMainSid()); tradeParams.setMainSid(pagging.getMainSid());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);

6
src/main/java/com/yxt/yythmall/biz/refundorder/RefundOrderService.java
View File

@ -90,7 +90,7 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
} }
Map<String, Object> sendBody=buildMessageBody(orderDetail,dto.getReason()); Map<String, Object> sendBody=buildMessageBody(orderDetail,dto.getReason());
ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/refund/createRefundOrder", sendBody, ResultBean.class); ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/refund/createRefundOrder", sendBody, ResultBean.class);
// ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("http://192.168.0.105:7777/refund/createRefundOrder", sendBody, ResultBean.class); // ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("http://192.168.0.105:7777/refund/createRefundOrder", sendBody, ResultBean.class);
ResultBean<RefundOrder> rb1 = postForEntity.getBody(); ResultBean<RefundOrder> rb1 = postForEntity.getBody();
LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData(); LinkedHashMap rb2 = (LinkedHashMap) postForEntity.getBody().getData();
@ -109,7 +109,7 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
refundOrder.setOrderSid(orderDetail.getSid()); refundOrder.setOrderSid(orderDetail.getSid());
refundOrder.setCreateTime(new Date()); refundOrder.setCreateTime(new Date());
baseMapper.insert(refundOrder); baseMapper.insert(refundOrder);
ResponseEntity<ResultBean> refundResponse = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/refund/reviewRefund?orderSid="+orderDetail.getMainSid(), sendBody, ResultBean.class); ResponseEntity<ResultBean> refundResponse = new RestTemplate().postForEntity("https://nhx.yxtsoft.com/wxPay/refund/reviewRefund?orderSid="+orderDetail.getMainSid(), sendBody, ResultBean.class);
// ResponseEntity<ResultBean> refundResponse = new RestTemplate().postForEntity("http://192.168.0.105:7777/refund/reviewRefund?orderSid="+orderDetail.getMainSid(), sendBody, ResultBean.class); // ResponseEntity<ResultBean> refundResponse = new RestTemplate().postForEntity("http://192.168.0.105:7777/refund/reviewRefund?orderSid="+orderDetail.getMainSid(), sendBody, ResultBean.class);
if(refundResponse.getBody().getCode().equals("200")){ if(refundResponse.getBody().getCode().equals("200")){
//该订单状态 //该订单状态
@ -184,7 +184,7 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
mp_template_msg.put("name", orderDetail.getName()); mp_template_msg.put("name", orderDetail.getName());
mp_template_msg.put("reason", reason); mp_template_msg.put("reason", reason);
mp_template_msg.put("orderSid", orderDetail.getMainSid()); mp_template_msg.put("orderSid", orderDetail.getMainSid());
mp_template_msg.put("returnUrl","https://supervise.yxtsoft.com/lpkapi/refund/isRefundBusiness"); mp_template_msg.put("returnUrl","https://nhx.yxtsoft.com/lpkapi/refund/isRefundBusiness");
// https://supervise.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid= // https://supervise.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid=
return mp_template_msg; return mp_template_msg;
} }

10
src/main/resources/application-pro.yml
View File

@ -22,9 +22,9 @@ spring:
timeout: 0 # 连接超时时间（毫秒） timeout: 0 # 连接超时时间（毫秒）
image: image:
upload: upload:
path: D:/webapps/lipinka/yythmall-ui/upload/ path: D:/webapps/nhx/yythmall-ui/upload/
url: url:
prefix: https://supervise.yxtsoft.com/lpk/upload/ prefix: https://nhx.yxtsoft.com/upload/
import: import:
filePath: D:/yxt-supervise-gf/upload/ filePath: D:/yxt-supervise-gf/upload/
@ -33,6 +33,6 @@ weixin:
appid: wx4724e3a3c27f36b5 appid: wx4724e3a3c27f36b5
secret: 971fd3b8aa7b08ce3e8a5f3e502b1a8d secret: 971fd3b8aa7b08ce3e8a5f3e502b1a8d
qrcode: qrcode:
giftCard: https://supervise.yxtsoft.com/lpkapi?code= giftCard: https://nhx.yxtsoft.com/lpkapi?code=
empCard: https://supervise.yxtsoft.com/lpkapi?qy= empCard: https://nhx.yxtsoft.com/lpkapi?qy=
empCardGift: https://supervise.yxtsoft.com/lpkapi?gift= empCardGift: https://nhx.yxtsoft.com/lpkapi?gift=
Write Preview
Loading…
Cancel
Save