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

修改

master
wangpengfei 4 months ago
parent
cc25b8025e
commit
264ce2501f
4 changed files with 56 additions and 33 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. 10
      src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java
  2. 15
      src/main/java/com/yxt/yythmall/biz/lpkcustomer/WxResult.java
  3. 52
      src/main/java/com/yxt/yythmall/biz/ordorder/OrdOrderService.java
  4. 12
      src/main/java/com/yxt/yythmall/biz/refundorder/RefundOrderService.java

10
src/main/java/com/yxt/yythmall/biz/lpkcustomer/LpkCustomerService.java
View File

@ -90,10 +90,14 @@ public class LpkCustomerService extends MybatisBaseService<LpkCustomerMapper, Lp
} }
// 判断存在不存在unionid，用户在开放平台的唯一标识符，若当前小程序已绑定到微信开放平台帐号下会返回，详见 UnionID 机制说明。、 // 判断存在不存在unionid，用户在开放平台的唯一标识符，若当前小程序已绑定到微信开放平台帐号下会返回，详见 UnionID 机制说明。、
JSONObject jsonObject = rbJsonObject.getData(); JSONObject jsonObject = rbJsonObject.getData();
if (!jsonObject.containsKey("openid")) { // if (!jsonObject.containsKey("openid")) {
return rb.setMsg("未获得openid，请联系管理员"); // return rb.setMsg("未获得openid，请联系管理员");
// }
WxResult wxResult=JSON.toJavaObject(jsonObject,WxResult.class);
String unionid="";
if(StringUtils.isNotBlank(wxResult.getUnionid())){
unionid = wxResult.getUnionid();
} }
String unionid = jsonObject.get("unionid").toString();
String openid = jsonObject.get("openid").toString(); String openid = jsonObject.get("openid").toString();
Map<String, String> map = new HashMap<>(); Map<String, String> map = new HashMap<>();
map.put("unionid",unionid); map.put("unionid",unionid);

15
src/main/java/com/yxt/yythmall/biz/lpkcustomer/WxResult.java
View File

@ -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;
}

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

@ -52,10 +52,11 @@ import java.util.stream.Collectors;
*/ */
@Service @Service
public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder> { public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder> {
// @Value("${weixin.url}")
private static final String OrderUrl = "https://supervise.yxtsoft.com/lpkapi/empcardgift/generateTopEmpCard?mainSid="; private static String url="https://ordermall.yxtsoft.com/ycjapi/";
private static final String or = "https://supervise.yxtsoft.com/lpkapi/vegetablecellar/addGoods?mainSid="; private static final String OrderUrl = "empcardgift/generateTopEmpCard?mainSid=";
private static final String payUrl = "https://supervise.yxtsoft.com/lpkapi/empsreservoorder/getPreOrder"; private static final String or = "vegetablecellar/addGoods?mainSid=";
private static final String payUrl ="empsreservoorder/getPreOrder";
@Autowired @Autowired
OrdOrderDetailService ordOrderDetailsService; OrdOrderDetailService ordOrderDetailsService;
@Autowired @Autowired
@ -78,7 +79,8 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
String appId; String appId;
@Value("${weixin.miniprogram.secret:971fd3b8aa7b08ce3e8a5f3e502b1a8d}") @Value("${weixin.miniprogram.secret:971fd3b8aa7b08ce3e8a5f3e502b1a8d}")
String secret; String secret;
// @Value("${weixin.payUrl}")
private String payUrl1="https://ordermall.yxtsoft.com/ycjwxPay/";
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ResultBean createOrder(OrdOrderDto dto) { public ResultBean createOrder(OrdOrderDto dto) {
@ -89,8 +91,8 @@ 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(), url+OrderUrl);
ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity(payUrl1+"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();
@ -116,7 +118,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
} }
// order.setName("商品"); // order.setName("商品");
order.setTimeRemarks(10); order.setTimeRemarks(10);
order.setReturnUrl(OrderUrl); order.setReturnUrl(url+OrderUrl);
baseMapper.insert(order); baseMapper.insert(order);
@ -142,7 +144,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(payUrl1+"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 +155,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(payUrl1+"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);
@ -202,8 +204,8 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
dto.setOrdOrderDetailsVoList(ordOrderDetailVos); dto.setOrdOrderDetailsVoList(ordOrderDetailVos);
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(), url+or);
ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity(payUrl1+"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();
@ -230,7 +232,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
} }
// order.setName("商品"); // order.setName("商品");
order.setTimeRemarks(10); order.setTimeRemarks(10);
order.setReturnUrl(or); order.setReturnUrl(url+or);
baseMapper.insert(order); baseMapper.insert(order);
@ -258,7 +260,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(payUrl1+"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 +271,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(payUrl1+"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);
@ -315,8 +317,8 @@ 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(), url+or);
ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity("https://supervise.yxtsoft.com/wxPay/order/createOrder", sendBody, ResultBean.class); ResponseEntity<ResultBean> postForEntity = new RestTemplate().postForEntity(payUrl1+"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();
@ -343,7 +345,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
} }
// order.setName("商品"); // order.setName("商品");
order.setTimeRemarks(10); order.setTimeRemarks(10);
order.setReturnUrl(or); order.setReturnUrl(url+or);
baseMapper.insert(order); baseMapper.insert(order);
List<OrdOrderDetail> ordOrders = new ArrayList<>(); List<OrdOrderDetail> ordOrders = new ArrayList<>();
dto.getOrdOrderDetailsVoList().forEach(s -> { dto.getOrdOrderDetailsVoList().forEach(s -> {
@ -367,7 +369,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(payUrl1+"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 +380,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(payUrl1+"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);
@ -411,7 +413,7 @@ public class OrdOrderService extends MybatisBaseService<OrdOrderMapper, OrdOrder
mp_template_msg.put("name", name); mp_template_msg.put("name", name);
mp_template_msg.put("timeRemarks", "10"); mp_template_msg.put("timeRemarks", "10");
mp_template_msg.put("returnUrl", returnUrl); mp_template_msg.put("returnUrl", returnUrl);
mp_template_msg.put("payUrl", payUrl); mp_template_msg.put("payUrl", url+payUrl);
return mp_template_msg; return mp_template_msg;
} }
@ -499,7 +501,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(payUrl1+"order/pay");
PayParams aVoid = new PayParams(); PayParams aVoid = new PayParams();
aVoid.setMainSid(pagging.getMainSid()); aVoid.setMainSid(pagging.getMainSid());
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
@ -510,7 +512,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(payUrl1+"order/orderQuery");
TradeParams tradeParams = new TradeParams(); TradeParams tradeParams = new TradeParams();
tradeParams.setMainSid(pagging.getMainSid()); tradeParams.setMainSid(pagging.getMainSid());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);
@ -568,7 +570,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(payUrl1+"order/pay");
PayParams aVoid = new PayParams(); PayParams aVoid = new PayParams();
aVoid.setMainSid(pagging.getMainSid()); aVoid.setMainSid(pagging.getMainSid());
payUrl.setParams(aVoid); payUrl.setParams(aVoid);
@ -579,7 +581,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(payUrl1+"order/orderQuery");
TradeParams tradeParams = new TradeParams(); TradeParams tradeParams = new TradeParams();
tradeParams.setMainSid(pagging.getMainSid()); tradeParams.setMainSid(pagging.getMainSid());
tradeNoUrl.setParams(tradeParams); tradeNoUrl.setParams(tradeParams);

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

@ -63,7 +63,9 @@ public class RefundOrderService extends MybatisBaseService<RefundOrderMapper, Re
LpkGoodsService lpkGoodsService; LpkGoodsService lpkGoodsService;
@Autowired @Autowired
VegetableCellarService vegetableCellarService; VegetableCellarService vegetableCellarService;
// @Value("${weixin.payUrl}")
private String payUrl="https://ordermall.yxtsoft.com/ycjwxPay/";
// private String payUrl="http://192.168.0.105:7778/";
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@ -90,8 +92,8 @@ 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(payUrl+"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:7778/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();
if (!rb1.getCode().equals("200")) { if (!rb1.getCode().equals("200")) {
@ -109,7 +111,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(payUrl+"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 +186,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://ordermall.yxtsoft.com/ycjapi/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;
} }

Write Preview
Loading…
Cancel
Save