From 16e078818316a63b02bb678fc2f90dc1ccc26b24 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 31 Aug 2023 11:17:50 +0800
Subject: [PATCH] 退款查询
---
src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java | 146 +++++++++++++++++++++++++++++-------------------
1 files changed, 87 insertions(+), 59 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index d23ad06..3f774cd 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -296,49 +296,50 @@
orderInfo.setPayResult("2");
break;
case "2":
- LaKaLaCreateOrderReqDate laKaLaCreateOrderReqDate = new LaKaLaCreateOrderReqDate();
- //订单编号
- laKaLaCreateOrderReqDate.setOut_order_no(orderInfo.getOrderNo());
- //订单金额，分计
- laKaLaCreateOrderReqDate.setTotal_amount(orderInfo.getAmount().multiply(new BigDecimal(100)).longValue());
- List<MallOrderItem> itemsLKL = orderInfo.getItems();
- //商品名称
- if(CollUtil.isEmpty(itemsLKL)){
- laKaLaCreateOrderReqDate.setOrder_info("商品");
+// LaKaLaCreateOrderReqDate laKaLaCreateOrderReqDate = new LaKaLaCreateOrderReqDate();
+// //订单编号
+// laKaLaCreateOrderReqDate.setOut_order_no(orderInfo.getOrderNo());
+// //订单金额，分计
+// laKaLaCreateOrderReqDate.setTotal_amount(orderInfo.getAmount().multiply(new BigDecimal(100)).longValue());
+// List<MallOrderItem> itemsLKL = orderInfo.getItems();
+// //商品名称
+// if(CollUtil.isEmpty(itemsLKL)){
+// laKaLaCreateOrderReqDate.setOrder_info("商品");
+// }else{
+// laKaLaCreateOrderReqDate.setOrder_info(itemsLKL.get(0).getGoodsName());
+// }
+// payResultStr = laKaLaService.verifyCreateOrder(laKaLaCreateOrderReqDate);
+// JSONObject parseObj = JSONUtil.parseObj(payResultStr);
+// String code = parseObj.get("code").toString();
+// if (!"true".equals(code)) {
+// throw new FebsException("跳转收银台失败");
+// }
+//
+// orderInfo.setPayOrderNo(parseObj.get("payOrderNo").toString());
+// orderInfo.setPayMethod("拉卡拉支付");
+// orderInfo.setPayResult("2");
+ UnipayDto unipayDto = new UnipayDto();
+ unipayDto.setAmount(orderInfo.getAmount());
+ unipayDto.setFrpCode("ALIPAY_H5");
+ unipayDto.setTradeMerchantNo("777184100385821");
+ unipayDto.setOrderNo(orderInfo.getOrderNo());
+ List<MallOrderItem> items = orderInfo.getItems();
+ if(CollUtil.isEmpty(items)){
+ unipayDto.setProductName("商品");
}else{
- laKaLaCreateOrderReqDate.setOrder_info(itemsLKL.get(0).getGoodsName());
+ unipayDto.setProductName(items.get(0).getGoodsName());
}
- payResultStr = laKaLaService.verifyCreateOrder(laKaLaCreateOrderReqDate);
- JSONObject parseObj = JSONUtil.parseObj(payResultStr);
- String code = parseObj.get("code").toString();
- if (!"true".equals(code)) {
- throw new FebsException("跳转收银台失败");
+ String unipayStr = payService.aliPay(orderInfo);
+ JSONObject jsonObjectRes = JSONUtil.parseObj(unipayStr);
+ Object alipay_trade_app_pay_response = jsonObjectRes.get("alipay_trade_app_pay_response");
+ JSONObject parseObj = JSONUtil.parseObj(alipay_trade_app_pay_response);
+ payResultStr = (String) parseObj.get("msg");
+ rcResult = (String) parseObj.get("code");
+ if(!"10000".equals(rcResult) || !"Success".equals(payResultStr) ){
+ throw new FebsException("支付失败");
}
-
- orderInfo.setPayOrderNo(parseObj.get("payOrderNo").toString());
- orderInfo.setPayMethod("拉卡拉支付");
- orderInfo.setPayResult("2");
-// UnipayDto unipayDto = new UnipayDto();
-// unipayDto.setAmount(orderInfo.getAmount());
-// unipayDto.setFrpCode("ALIPAY_H5");
-// unipayDto.setTradeMerchantNo("777184100385821");
-// unipayDto.setOrderNo(orderInfo.getOrderNo());
-// List<MallOrderItem> items = orderInfo.getItems();
-// if(CollUtil.isEmpty(items)){
-// unipayDto.setProductName("商品");
-// }else{
-// unipayDto.setProductName(items.get(0).getGoodsName());
-// }
-// String unipayStr = unipayService.unipay(unipayDto);
-// if("fail" == unipayStr){
-// throw new FebsException("支付失败");
-// }else{
-// JSONObject jsonObject = JSONUtil.parseObj(unipayStr);
-// payResultStr = (String) jsonObject.get("r7_TrxNo");
-// rcResult = (String) jsonObject.get("rc_Result");
-// }
-// orderInfo.setPayOrderNo(payResultStr);
-// orderInfo.setPayMethod("支付宝支付");
+ orderInfo.setPayOrderNo(payResultStr);
+ orderInfo.setPayMethod("支付宝支付");
break;
case "3":
payResultStr = balancePay(orderInfo, payOrderDto.getTradePwd(), "balance");
@@ -362,9 +363,9 @@
mallMqRecord.setCreateTime(orderInfo.getPayTime());
mallMqRecordMapper.insert(mallMqRecord);
//发送补贴消息
- agentProducer.sendPerkMoneyMsg(orderInfo.getId());
- //发送代理自动升级消息
- agentProducer.sendAutoLevelUpMsg(member.getId());
+// agentProducer.sendPerkMoneyMsg(orderInfo.getId());
+// //发送代理自动升级消息
+// agentProducer.sendAutoLevelUpMsg(member.getId());
break;
case "4":
if (orderInfo.getOrderType() != 2) {
@@ -434,20 +435,20 @@
return map;
}
- public static void main(String[] args) {
- String str = "{\"biz_code\":\"JS000000\",\"biz_msg\":\"成功\",\"data\":\"{\\\"order_status\\\":\\\"P2000\\\",\\\"jp_order_no\\\":\\\"100120220826446740396081496064\\\",\\\"err_msg\\\":\\\"短信验证码不符\\\",\\\"err_code\\\":\\\"CP110026\\\",\\\"sign_no\\\":\\\"\\\",\\\"mch_order_no\\\":\\\"NO_2022082618263952399\\\"}\",\"mch_no\":\"888118000001971\",\"rand_str\":\"an2w7ulf5ru6upkk5bdg441kdi3gnpvu\",\"resp_code\":\"SUCCESS\",\"sec_key\":\"\",\"sign\":\"NiJXRTSIZ9xZMUOwEHiEHdZXmgL2cHUU5WUa1NbMRRzui0DIiuZSW4e31LjnBxwVwmy3uuPMP+tqhY8VLyC8uCFOdGdZI7e72VuRvyvaiW7/sqCrsfgPOBEjiGE/CmSMRoEXv9HmqCyNBF6iHSEhQJql5Yge30dQdyB6xFfqjk0=\",\"sign_type\":\"2\"}";
-
- JSONObject jsonObject = JSONUtil.parseObj(str);
- String payResultStr = (String) jsonObject.get("biz_code");
- String signBizMsg = (String) jsonObject.get("biz_msg");
- String signData = (String) jsonObject.get("data");
-
- JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
- String err_msg = (String) signDatajsonObject.get("err_msg");
- if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
- System.out.println(err_msg);
- }
- }
+// public static void main(String[] args) {
+// String str = "{\"biz_code\":\"JS000000\",\"biz_msg\":\"成功\",\"data\":\"{\\\"order_status\\\":\\\"P2000\\\",\\\"jp_order_no\\\":\\\"100120220826446740396081496064\\\",\\\"err_msg\\\":\\\"短信验证码不符\\\",\\\"err_code\\\":\\\"CP110026\\\",\\\"sign_no\\\":\\\"\\\",\\\"mch_order_no\\\":\\\"NO_2022082618263952399\\\"}\",\"mch_no\":\"888118000001971\",\"rand_str\":\"an2w7ulf5ru6upkk5bdg441kdi3gnpvu\",\"resp_code\":\"SUCCESS\",\"sec_key\":\"\",\"sign\":\"NiJXRTSIZ9xZMUOwEHiEHdZXmgL2cHUU5WUa1NbMRRzui0DIiuZSW4e31LjnBxwVwmy3uuPMP+tqhY8VLyC8uCFOdGdZI7e72VuRvyvaiW7/sqCrsfgPOBEjiGE/CmSMRoEXv9HmqCyNBF6iHSEhQJql5Yge30dQdyB6xFfqjk0=\",\"sign_type\":\"2\"}";
+//
+// JSONObject jsonObject = JSONUtil.parseObj(str);
+// String payResultStr = (String) jsonObject.get("biz_code");
+// String signBizMsg = (String) jsonObject.get("biz_msg");
+// String signData = (String) jsonObject.get("data");
+//
+// JSONObject signDatajsonObject = JSONUtil.parseObj(signData);
+// String err_msg = (String) signDatajsonObject.get("err_msg");
+// if(ObjectUtil.isNotNull(signDatajsonObject.get("err_code"))){
+// System.out.println(err_msg);
+// }
+// }
private String balancePay(MallOrderInfo orderInfo, String tradePwd, String field) {
if (StrUtil.isBlank(tradePwd)) {
@@ -616,7 +617,7 @@
MallOrderRefundOperation operation = new MallOrderRefundOperation();
operation.setOrderId(orderInfo.getId());
operation.setRefundId(orderRefund.getId());
- operation.setContent(StrUtil.format("用户:{}提交退款申请", member.getName()));
+ operation.setContent(StrUtil.format("用户:{}提交退款申请", member.getPhone()));
mallOrderRefundOperationMapper.insert(operation);
}
@@ -637,7 +638,7 @@
MallOrderRefundOperation operation = new MallOrderRefundOperation();
operation.setOrderId(refundExpressDto.getId());
operation.setRefundId(orderRefund.getId());
- operation.setContent(StrUtil.format("用户:{}提交物流信息,快递公司:{},单号:{}", member.getName(), refundExpressDto.getExpressCom(), refundExpressDto.getExpressNo()));
+ operation.setContent(StrUtil.format("用户:{}提交物流信息,快递公司:{},单号:{}", member.getPhone(), refundExpressDto.getExpressCom(), refundExpressDto.getExpressNo()));
mallOrderRefundOperationMapper.insert(operation);
}
@@ -803,4 +804,31 @@
return apiScoreSetVo;
}
+ public static void main(String[] args) {
+
+ String unipayStr = "{\n" +
+ " \"alipay_trade_app_pay_response\": {\n" +
+ " \"code\": \"10000\",\n" +
+ " \"msg\": \"Success\",\n" +
+ " \"app_id\": \"2014072300007148\",\n" +
+ " \"auth_app_id\": \"2014072300007148\",\n" +
+ " \"charset\": \"utf-8\",\n" +
+ " \"timestamp\": \"2016-10-11 17:43:36\",\n" +
+ " \"out_trade_no\": \"081622560194853\",\n" +
+ " \"total_amount\": \"9.00\",\n" +
+ " \"trade_no\": \"2016081621001004400236957647\",\n" +
+ " \"seller_id\": \"2088702849871851\"\n" +
+ " },\n" +
+ " \"sign\": \"NGfStJf3i3ooWBuCDIQSumOpaGBcQz+aoAqyGh3W6EqA/gmyPYwLJ********\",\n" +
+ " \"sign_type\": \"RSA2\"\n" +
+ "}";
+ JSONObject jsonObjectRes = JSONUtil.parseObj(unipayStr);
+ Object alipay_trade_app_pay_response = jsonObjectRes.get("alipay_trade_app_pay_response");
+ JSONObject parseObj = JSONUtil.parseObj(alipay_trade_app_pay_response);
+ String payResultStr = (String) parseObj.get("msg");
+ String rcResult = (String) parseObj.get("code");
+ System.out.println(payResultStr);
+ System.out.println(rcResult);
+ }
+
}
--
Gitblit v1.9.1