From ae40432d02f5a698994c0b0847ef1b3f3f31451b Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期二, 08 十月 2024 17:13:27 +0800
Subject: [PATCH] Merge branch 'master-v3' of http://47.96.225.205:8888/r/flowerbackend-v2 into master-v3
---
src/main/java/com/mzl/flower/pay/SybPayService.java | 171 +++++++++++++++++++++++++++++---------------------------
src/main/java/com/mzl/flower/service/payment/OrderService.java | 9 ++
2 files changed, 95 insertions(+), 85 deletions(-)
diff --git a/src/main/java/com/mzl/flower/pay/SybPayService.java b/src/main/java/com/mzl/flower/pay/SybPayService.java
index 8dc5e9e..8144d60 100644
--- a/src/main/java/com/mzl/flower/pay/SybPayService.java
+++ b/src/main/java/com/mzl/flower/pay/SybPayService.java
@@ -1,9 +1,13 @@
package com.mzl.flower.pay;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
import java.net.URLEncoder;
import java.util.Map;
import java.util.TreeMap;
+@Slf4j
public class SybPayService {
@@ -27,27 +31,27 @@
TreeMap<String,String> params = new TreeMap<String,String>();
if(!SybUtil.isEmpty(SybConstants.SYB_ORGID))
params.put("orgid", SybConstants.SYB_ORGID);
- params.put("cusid", SybConstants.SYB_CUSID);
- params.put("appid", SybConstants.SYB_APPID);
- params.put("version", "12");
- params.put("trxamt", String.valueOf(trxamt));
- params.put("reqsn", reqsn);
- params.put("unireqsn", unireqsn);
- params.put("notify_url", notifyUrl);
- params.put("body", body);
- params.put("remark", remark);
- params.put("paytype", "W06");
- params.put("randomstr", SybUtil.getValidatecode(8));
- params.put("signtype", SybConstants.SIGN_TYPE);
- String appkey = "";
- if(SybConstants.SIGN_TYPE.equals("RSA"))
- appkey = SybConstants.SYB_RSACUSPRIKEY;
- else if(SybConstants.SIGN_TYPE.equals("SM2"))
- appkey = SybConstants.SYB_SM2PPRIVATEKEY;
- else
- appkey = SybConstants.SYB_MD5_APPKEY;
- params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
- return params;
+ params.put("cusid", SybConstants.SYB_CUSID);
+ params.put("appid", SybConstants.SYB_APPID);
+ params.put("version", "12");
+ params.put("trxamt", String.valueOf(trxamt));
+ params.put("reqsn", reqsn);
+ params.put("unireqsn", unireqsn);
+ params.put("notify_url", notifyUrl);
+ params.put("body", body);
+ params.put("remark", remark);
+ params.put("paytype", "W06");
+ params.put("randomstr", SybUtil.getValidatecode(8));
+ params.put("signtype", SybConstants.SIGN_TYPE);
+ String appkey = "";
+ if(SybConstants.SIGN_TYPE.equals("RSA"))
+ appkey = SybConstants.SYB_RSACUSPRIKEY;
+ else if(SybConstants.SIGN_TYPE.equals("SM2"))
+ appkey = SybConstants.SYB_SM2PPRIVATEKEY;
+ else
+ appkey = SybConstants.SYB_MD5_APPKEY;
+ params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
+ return params;
}
@@ -66,27 +70,27 @@
TreeMap<String,String> params = new TreeMap<String,String>();
if(!SybUtil.isEmpty(SybConstants.SYB_ORGID))
params.put("orgid", SybConstants.SYB_ORGID);
- params.put("cusid", SybConstants.SYB_CUSID);
- params.put("appid", SybConstants.SYB_APPID);
- params.put("version", "11");
- params.put("trxamt", String.valueOf(trxamt));
- params.put("reqsn", reqsn);
- params.put("oldtrxid", oldtrxid);
- params.put("oldreqsn", oldreqsn);
- params.put("randomstr", SybUtil.getValidatecode(8));
- params.put("signtype", SybConstants.SIGN_TYPE);
- String appkey = "";
- if(SybConstants.SIGN_TYPE.equals("RSA"))
- appkey = SybConstants.SYB_RSACUSPRIKEY;
- else if(SybConstants.SIGN_TYPE.equals("SM2"))
- appkey = SybConstants.SYB_SM2PPRIVATEKEY;
- else
- appkey = SybConstants.SYB_MD5_APPKEY;
- params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
- byte[] bys = http.postParams(params, true);
- String result = new String(bys,"UTF-8");
- Map<String,String> map = handleResult(result);
- return map;
+ params.put("cusid", SybConstants.SYB_CUSID);
+ params.put("appid", SybConstants.SYB_APPID);
+ params.put("version", "11");
+ params.put("trxamt", String.valueOf(trxamt));
+ params.put("reqsn", reqsn);
+ params.put("oldtrxid", oldtrxid);
+ params.put("oldreqsn", oldreqsn);
+ params.put("randomstr", SybUtil.getValidatecode(8));
+ params.put("signtype", SybConstants.SIGN_TYPE);
+ String appkey = "";
+ if(SybConstants.SIGN_TYPE.equals("RSA"))
+ appkey = SybConstants.SYB_RSACUSPRIKEY;
+ else if(SybConstants.SIGN_TYPE.equals("SM2"))
+ appkey = SybConstants.SYB_SM2PPRIVATEKEY;
+ else
+ appkey = SybConstants.SYB_MD5_APPKEY;
+ params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
+ byte[] bys = http.postParams(params, true);
+ String result = new String(bys,"UTF-8");
+ Map<String,String> map = handleResult(result);
+ return map;
}
/**
@@ -104,27 +108,27 @@
TreeMap<String,String> params = new TreeMap<String,String>();
if(!SybUtil.isEmpty(SybConstants.SYB_ORGID))
params.put("orgid", SybConstants.SYB_ORGID);
- params.put("cusid", SybConstants.SYB_CUSID);
- params.put("appid", SybConstants.SYB_APPID);
- params.put("version", "11");
- params.put("trxamt", String.valueOf(trxamt));
- params.put("reqsn", reqsn);
- params.put("oldreqsn", oldreqsn);
- params.put("oldtrxid", oldtrxid);
- params.put("randomstr", SybUtil.getValidatecode(8));
- params.put("signtype", SybConstants.SIGN_TYPE);
- String appkey = "";
- if(SybConstants.SIGN_TYPE.equals("RSA"))
- appkey = SybConstants.SYB_RSACUSPRIKEY;
- else if(SybConstants.SIGN_TYPE.equals("SM2"))
- appkey = SybConstants.SYB_SM2PPRIVATEKEY;
- else
- appkey = SybConstants.SYB_MD5_APPKEY;
- params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
- byte[] bys = http.postParams(params, true);
- String result = new String(bys,"UTF-8");
- Map<String,String> map = handleResult(result);
- return map;
+ params.put("cusid", SybConstants.SYB_CUSID);
+ params.put("appid", SybConstants.SYB_APPID);
+ params.put("version", "11");
+ params.put("trxamt", String.valueOf(trxamt));
+ params.put("reqsn", reqsn);
+ params.put("oldreqsn", oldreqsn);
+ params.put("oldtrxid", oldtrxid);
+ params.put("randomstr", SybUtil.getValidatecode(8));
+ params.put("signtype", SybConstants.SIGN_TYPE);
+ String appkey = "";
+ if(SybConstants.SIGN_TYPE.equals("RSA"))
+ appkey = SybConstants.SYB_RSACUSPRIKEY;
+ else if(SybConstants.SIGN_TYPE.equals("SM2"))
+ appkey = SybConstants.SYB_SM2PPRIVATEKEY;
+ else
+ appkey = SybConstants.SYB_MD5_APPKEY;
+ params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
+ byte[] bys = http.postParams(params, true);
+ String result = new String(bys,"UTF-8");
+ Map<String,String> map = handleResult(result);
+ return map;
}
/**
@@ -140,25 +144,25 @@
TreeMap<String,String> params = new TreeMap<String,String>();
if(!SybUtil.isEmpty(SybConstants.SYB_ORGID))
params.put("orgid", SybConstants.SYB_ORGID);
- params.put("cusid", SybConstants.SYB_CUSID);
- params.put("appid", SybConstants.SYB_APPID);
- params.put("version", "12");
- params.put("oldreqsn", oldreqsn);
- params.put("oldtrxid", oldtrxid);
- params.put("randomstr", SybUtil.getValidatecode(8));
- params.put("signtype", SybConstants.SIGN_TYPE);
- String appkey = "";
- if(SybConstants.SIGN_TYPE.equals("RSA"))
- appkey = SybConstants.SYB_RSACUSPRIKEY;
- else if(SybConstants.SIGN_TYPE.equals("SM2"))
- appkey = SybConstants.SYB_SM2PPRIVATEKEY;
- else
- appkey = SybConstants.SYB_MD5_APPKEY;
- params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
- byte[] bys = http.postParams(params, true);
- String result = new String(bys,"UTF-8");
- Map<String,String> map = handleResult(result);
- return map;
+ params.put("cusid", SybConstants.SYB_CUSID);
+ params.put("appid", SybConstants.SYB_APPID);
+ params.put("version", "12");
+ params.put("oldreqsn", oldreqsn);
+ params.put("oldtrxid", oldtrxid);
+ params.put("randomstr", SybUtil.getValidatecode(8));
+ params.put("signtype", SybConstants.SIGN_TYPE);
+ String appkey = "";
+ if(SybConstants.SIGN_TYPE.equals("RSA"))
+ appkey = SybConstants.SYB_RSACUSPRIKEY;
+ else if(SybConstants.SIGN_TYPE.equals("SM2"))
+ appkey = SybConstants.SYB_SM2PPRIVATEKEY;
+ else
+ appkey = SybConstants.SYB_MD5_APPKEY;
+ params.put("sign", SybUtil.unionSign(params,appkey,SybConstants.SIGN_TYPE));
+ byte[] bys = http.postParams(params, true);
+ String result = new String(bys,"UTF-8");
+ Map<String,String> map = handleResult(result);
+ return map;
}
public Map<String,String> query(String reqsn,String trxid) throws Exception{
@@ -190,7 +194,8 @@
public static Map<String,String> handleResult(String result) throws Exception{
- System.out.println("ret:"+result);
+ System.out.println("通联支付返回结果:"+result);
+ log.info("ret:"+result);
Map map = SybUtil.json2Obj(result, Map.class);
if(map == null){
throw new Exception("返回数据错误");
diff --git a/src/main/java/com/mzl/flower/service/payment/OrderService.java b/src/main/java/com/mzl/flower/service/payment/OrderService.java
index 2f84bb7..c79d7e6 100644
--- a/src/main/java/com/mzl/flower/service/payment/OrderService.java
+++ b/src/main/java/com/mzl/flower/service/payment/OrderService.java
@@ -780,6 +780,7 @@
if(orders == null || orders.size() == 0){
return;
}
+ /*
for (Order o : orders) {
//set status_backend = 'RECEIVE', status = 'RECEIVE'
o.setStatusBackend("RECEIVE");
@@ -796,7 +797,8 @@
orderMapper.updateById(o);
}
- //orderMapper.setPartnerOrderReceive();
+ */
+ orderMapper.setPartnerOrderReceive();
}
/**
@@ -817,6 +819,7 @@
o.setStatusBackend(Constants.ORDER_STATUS_BACKEND.RECEIVE.name());
o.update(SecurityUtils.getUserId());
+ /*
//发送微信发货请求
JSONObject jsonObject = sendWxDeliveryGood(o);
if (jsonObject != null && (int) jsonObject.get("errcode") == 0) {
@@ -826,7 +829,7 @@
o.setWxDeliveryGood(false);
o.setWxDeliveryMsg(GsonUtil.toJson(jsonObject));
}
-
+ */
orderMapper.updateById(o);
}
@@ -1240,6 +1243,7 @@
customerPointService.consumptionPoint(totalAmount, o.getOrderNo(), o.getCreateBy());
}
+ /*
public JSONObject sendWxDeliveryGood(Order o) {
JSONObject json = new JSONObject();
List<OrderItem> items = orderItemMapper.selectList(new LambdaQueryWrapper<OrderItem>()
@@ -1278,6 +1282,7 @@
return json;
}
}
+ */
public Order confirmOrderReceive(String id) {
Order o = orderMapper.selectById(id);
--
Gitblit v1.9.3