Skip to content

S
shop
Commit 4dba7790 authored by 张永's avatar 张永
Browse files
Options

V1.1.7.8.2

parent 5a30abda
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 12 deletions
src/main/java/com/egolm/shop/api/PayNotifyController.java
View file @ 4dba7790
package com.egolm.shop.api; package com.egolm.shop.api;
import java.io.IOException;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -9,8 +7,6 @@ import javax.servlet.ServletInputStream; ...@@ -9,8 +7,6 @@ import javax.servlet.ServletInputStream;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.dom4j.DocumentHelper;
import org.json.XML;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -20,15 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping; ...@@ -20,15 +16,11 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSONObject;
import com.egolm.common.DateUtil;
import com.egolm.common.FileUtil;
import com.egolm.common.GsonUtil; import com.egolm.common.GsonUtil;
import com.egolm.common.HttpsUtil; import com.egolm.common.HttpsUtil;
import com.egolm.common.StringUtil; import com.egolm.common.StringUtil;
import com.egolm.shop.api.service.OrderService; import com.egolm.shop.api.service.OrderService;
import com.egolm.shop.bean.WxPayResponse; import com.egolm.shop.bean.WxPayResponse;
import com.egolm.shop.common.component.IDCLogResource;
import com.thoughtworks.xstream.XStream; import com.thoughtworks.xstream.XStream;
import com.thoughtworks.xstream.io.xml.DomDriver; import com.thoughtworks.xstream.io.xml.DomDriver;
...@@ -67,13 +59,15 @@ public class PayNotifyController { ...@@ -67,13 +59,15 @@ public class PayNotifyController {
String xmlMsg = StringUtil.inputStream2String(in); String xmlMsg = StringUtil.inputStream2String(in);
logger.info("从egoPay中接收到支付回调信息 {}",xmlMsg); logger.info("从egoPay中接收到支付回调信息 {}",xmlMsg);
logger.info("从egoPay中接收到支付回调信息 : {}", xmlMsg.replace("\r\n",""));
postData = (WxPayResponse) xs.fromXML(xmlMsg); postData = (WxPayResponse) xs.fromXML(xmlMsg);
List<Map<String, Object>> returnMap = orderService.payCallback(postData,xmlMsg,callBackFilePath); List<Map<String, Object>> returnMap = orderService.payCallback(postData,xmlMsg,callBackFilePath);
logger.info("从egoPay中接收到支付信息结果 {}",GsonUtil.toJson(returnMap)); logger.info("从egoPay中接收到支付信息结果 {}",GsonUtil.toJson(returnMap));
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); logger.info("处理从egoPay中接收到支付回调信息异常:{} ",e);
} }
return "success"; return "success";
} }
......
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @ 4dba7790
...@@ -1074,8 +1074,8 @@ public class OrderServiceImpl implements OrderService { ...@@ -1074,8 +1074,8 @@ public class OrderServiceImpl implements OrderService {
@Override @Override
public void confirmReceipt(String custNo, String subOrderID) { public void confirmReceipt(String custNo, String subOrderID) {
String sql = "" + "DECLARE @CustNO VARCHAR(20) " + "DECLARE @SubOrderID VARCHAR(20) " String sql = "" + "DECLARE @CustNO VARCHAR(20) " + "DECLARE @SubOrderID VARCHAR(36) "
+ "DECLARE @SalesOrderID VARCHAR(20) " + "DECLARE @OrderStatusName VARCHAR(20) " + "DECLARE @SalesOrderID VARCHAR(36) " + "DECLARE @OrderStatusName VARCHAR(20) "
+ "DECLARE @OrderStatus INT " + "DECLARE @TargetStatus INT " + "SELECT @CustNO = '" + custNo + "' " + "DECLARE @OrderStatus INT " + "DECLARE @TargetStatus INT " + "SELECT @CustNO = '" + custNo + "' "
+ "SELECT @SubOrderID = '" + subOrderID + "' " + "SELECT @TargetStatus = 16 " + "SELECT @SubOrderID = '" + subOrderID + "' " + "SELECT @TargetStatus = 16 "
+ "SELECT @OrderStatusName = '收货完成' " + "SELECT @OrderStatusName = '收货完成' "
......
src/main/java/com/egolm/shop/common/config/SwaggerConfig.java
View file @ 4dba7790
...@@ -31,7 +31,7 @@ public class SwaggerConfig { ...@@ -31,7 +31,7 @@ public class SwaggerConfig {
} }
private ApiInfo apiInfo() { private ApiInfo apiInfo() {
return new ApiInfoBuilder().title("B2B商品在线接口服务在线文档").version("1.0").description("领锋智能(嘉兴)科技有限公司,会员管理系统API").build(); return new ApiInfoBuilder().title("B2B商品在线接口服务在线文档").version("1.0").description("领锋智能(嘉兴)科技有限公司,会员管理系统API.参数按accsii排序（升序）,时间戳为13位.").build();
} }
......
src/main/resources/templates/redmine.html
View file @ 4dba7790
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
</head> </head>
<body> <body>
<div id="app"> <div id="app">
<el-divider content-position="left">V1.1.7.8.2 2024-8-14</el-divider>
<p class="title">1.回调增加个日志，便于查。</p>
<p class="title">2.confirmReceipt 长度扩36</p>
<el-divider content-position="left">V1.1.7.8.1 2024-8-8</el-divider> <el-divider content-position="left">V1.1.7.8.1 2024-8-8</el-divider>
<p class="title">1.解决支付回调时,Status=0时再调用一次拆单过程2。</p> <p class="title">1.解决支付回调时,Status=0时再调用一次拆单过程2。</p>
<el-divider content-position="left">V1.1.7.8 2024-7-20</el-divider> <el-divider content-position="left">V1.1.7.8 2024-7-20</el-divider>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment