Skip to content

S
shop
Commit 7a1f7890 authored by 张永's avatar 张永
Browse files
Options

V1.1.3

parent dd59132e
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 1 deletion
pom.xml
View file @ 7a1f7890
......@@ -207,7 +207,7 @@
</executions>
<configuration>
<repository>dockerhub.linkfern.com/b2c/shopapi</repository>
<tag>V1.1.2</tag>
<tag>V1.1.3</tag>
<buildArgs>
<JAR_FILE>${project.build.finalName}.jar</JAR_FILE>
</buildArgs>
......
src/main/java/com/egolm/shop/api/service/impl/OrderServiceImpl.java
View file @ 7a1f7890
......@@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSONObject;
import com.egolm.common.DateUtil;
import com.egolm.common.HttpsUtil;
import com.egolm.common.StringUtil;
import com.egolm.common.Util;
import com.egolm.common.bean.Rjx;
......@@ -402,9 +403,38 @@ public class OrderServiceImpl implements OrderService {
+ "' , '" + DateUtil.format(dPayDateTime, DateUtil.FMT_DATE_SECOND) + "' , '" + PayTypeID + "' ,0,'' ";
List<Map<String, Object>> returnMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
this.pushOrderToSdongPo(returnMap);
return returnMap;
}
//推送订单到蔬东波
public void pushOrderToSdongPo(List<Map<String, Object>> returnMap) {
try {
if(returnMap.size() >0 ) {
Map<String,Object> orderMap = returnMap.get(0);
String Status = orderMap.get("Status")+"";
String salesOrderID = orderMap.get("SalesOrderID")+"";
boolean IsPush = Boolean.valueOf(orderMap.get("IsPush")+"");
if(IsPush && Status.equals("0")) {
String ssql = "select * FROM tSystemCtrl WHERE sCode = 'OrderToSudongPoUrl' ";
Map<String,Object> setMap = jdbcTemplate.queryForMap(ssql);
String url = setMap.get("sValue1")+"";
if(StringUtil.isNotBlank(url)) {
String result = HttpsUtil.doGet(url+"?salesOrderID="+salesOrderID);
logger.info("推送到蔬东坡的订单 :{},结果:{} ",salesOrderID,result);
}else {
logger.info("推送到蔬东坡的订单地址未配置 ");
}
}
}
} catch (Exception e) {
logger.info("推送到蔬东坡的订单 异常 ",e);
}
}
@Override
public String getSubOrderDetail(String subOrderID) {
......@@ -1284,6 +1314,9 @@ public class OrderServiceImpl implements OrderService {
+ PayAmount + "' , '" + pay_succ_time + "' , '" + PayTypeID + "' , '" + StatusID + "' , '"
+ StatusName + "' ";
returnMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
this.pushOrderToSdongPo(returnMap);
} else if (event_type.equals("refund.succeeded")) { // 退款成功
// up_B2BCancelOrderBizPayCallBack
String status = event_content.getString("status");
......@@ -1332,6 +1365,8 @@ public class OrderServiceImpl implements OrderService {
String sql = "exec up_B2BSalesOrderPayCallBack '" + OutTradeNo + "' ,'" + OrderNo + "' , '"
+ TotalAmount + "' , '" + pay_succ_time + "' , '" + PayTypeID + "' , '1' , '支付成功' ";
returnMap = jdbcTemplate.executeMutil(sql).getDatas().get(0);
this.pushOrderToSdongPo(returnMap);
}
if (from_type.equals("REFUND")) {
String OutRefundNo = reqObj.getString("OutRefundNo"); // 退款交易号
......
src/main/resources/templates/redmine.html
View file @ 7a1f7890
......@@ -22,6 +22,8 @@
</head>
<body>
<div id="app">
<el-divider content-position="left">V1.1.3 2023-10-31</el-divider>
<p class="title">1.增加订单支付完成推送至蔬东坡接口</p>
<el-divider content-position="left">V1.1.2 2023-10-20</el-divider>
<p class="title">1.接口调用日志通过AOP保存到tIdcServicesLogs表中</p>
<p class="title">2.修改 需求 #15878 </p>
......
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