|
|
@@ -2,6 +2,9 @@ package com.kmall.schedule.service;
|
|
|
|
|
|
import com.kmall.common.utils.*;
|
|
|
import com.kmall.common.utils.wechat.*;
|
|
|
+import com.kmall.common.utils.wechat.wxglobal.WechatGlobalUtil;
|
|
|
+import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalQueryApiResult;
|
|
|
+import com.kmall.common.utils.wechat.wxglobal.dto.WechatGlobalRefundQueryResult;
|
|
|
import com.kmall.schedule.dao.OrderWXPayRecordMapper;
|
|
|
import com.kmall.schedule.dao.QzGroupMapper;
|
|
|
import com.kmall.schedule.dao.QzOrderMapper;
|
|
|
@@ -213,7 +216,7 @@ public class QzOrderService {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 更新退款中或小程序更新退款信息异常订单
|
|
|
+ * 更新退款中的，或小程序更新退款信息异常订单
|
|
|
*/
|
|
|
@Transactional
|
|
|
public void refundUpdate() {
|
|
|
@@ -223,79 +226,169 @@ public class QzOrderService {
|
|
|
List<Map> refundOrderList = qzOrderMapper.queryRefundOrderList();
|
|
|
if (null != refundOrderList && refundOrderList.size() > 0) {
|
|
|
for (Map map : refundOrderList) {
|
|
|
- String out_trade_no = MapUtils.getString("merch_order_sn", map);
|
|
|
- String order_id = MapUtils.getString("order_id", map);
|
|
|
- Integer is_onffline_order = MapUtils.getInteger("is_onffline_order", map);
|
|
|
- String order_sn_wx = MapUtils.getString("order_sn_wx", map);
|
|
|
-
|
|
|
- if (is_onffline_order == 1) {
|
|
|
- out_trade_no = order_sn_wx;
|
|
|
+ String pay_flag = MapUtils.getString("pay_flag", map);
|
|
|
+ String orderId = MapUtils.getString("order_id", map);
|
|
|
+ if(org.apache.commons.lang.StringUtils.isNotEmpty(pay_flag)) {
|
|
|
+ if (pay_flag.equalsIgnoreCase("wxglobalpay")) {//微信国际支付
|
|
|
+ wxGlobalRefundQuery(map);
|
|
|
+ } else {//微信支付、平安支付、线下扫码支付
|
|
|
+ wxRefundquery(map);
|
|
|
+ }
|
|
|
+ }else{
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate 订单编号【"+orderId+"】的支付方式不能为空！ ");
|
|
|
}
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate 未查到退款数据 ");
|
|
|
+ }
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate is end ");
|
|
|
+ }
|
|
|
|
|
|
- WechatRefundQueryResult result = WechatUtil.wxRefundquery(out_trade_no);
|
|
|
- if (result.getReturn_code().equalsIgnoreCase("SUCCESS")) {
|
|
|
- if (result.getResult_code().equalsIgnoreCase("SUCCESS")) {
|
|
|
- Map refundRaram = new HashMap();
|
|
|
- int msgCount = Integer.parseInt(result.getRefund_count());
|
|
|
- for (int i = 0; i < msgCount; i++) {
|
|
|
- WechatRefundQueryResult querySuccessResponseDto =
|
|
|
- ReaderXmlForDOM4J.parse(result.getXmlStr(), i);
|
|
|
- if (result.getReturn_code().equalsIgnoreCase("SUCCESS")) {
|
|
|
- if (result.getResult_code().equalsIgnoreCase("SUCCESS")) {
|
|
|
- result.setRefund_success_time(querySuccessResponseDto.getRefund_success_time());
|
|
|
- result.setOut_refund_no(querySuccessResponseDto.getOut_refund_no());
|
|
|
- result.setRefund_account(querySuccessResponseDto.getRefund_account());
|
|
|
- result.setRefund_channel(querySuccessResponseDto.getRefund_channel());
|
|
|
- result.setRefund_fee(querySuccessResponseDto.getRefund_fee());
|
|
|
- result.setRefund_id(querySuccessResponseDto.getRefund_id());
|
|
|
- result.setRefund_recv_accout(querySuccessResponseDto.getRefund_recv_accout());
|
|
|
- result.setRefund_status(querySuccessResponseDto.getRefund_status());
|
|
|
-
|
|
|
- Date successTime = DateUtils.strToDate(result.getRefund_success_time());
|
|
|
- refundRaram.put("refundTime", successTime);
|
|
|
- refundRaram.put("outRefundNo", result.getOut_refund_no());
|
|
|
- refundRaram.put("refundId", result.getRefund_id());
|
|
|
- refundRaram.put("refundMoney",
|
|
|
- BigDecimal.valueOf(Long.valueOf(result.getRefund_fee()))
|
|
|
- .divide(Constant.ONE_HUNDRED));
|
|
|
- if (result.getRefund_status().equalsIgnoreCase("SUCCESS")) {
|
|
|
- refundRaram.put("refundStatus", 2);
|
|
|
- refundRaram.put("wechat_refund_status_des", "退款成功");
|
|
|
- } else if (result.getRefund_status().equalsIgnoreCase("REFUNDCLOSE")) {
|
|
|
- refundRaram.put("refundStatus", 4);
|
|
|
- refundRaram.put("wechat_refund_status_des", "退款关闭");
|
|
|
- } else if (result.getRefund_status().equalsIgnoreCase("PROCESSING")) {
|
|
|
- refundRaram.put("refundStatus", 5);
|
|
|
- refundRaram.put("wechat_refund_status_des", "退款处理中");
|
|
|
- } else if (result.getRefund_status().equalsIgnoreCase("CHANGE")) {
|
|
|
- refundRaram.put("refundStatus", 4);
|
|
|
- refundRaram.put("wechat_refund_status_des", "退款异常");
|
|
|
- }
|
|
|
- refundRaram.put("refundRecvAccout", result.getRefund_recv_accout());
|
|
|
- refundRaram.put("orderRefundId", result.getOut_refund_no());
|
|
|
- qzOrderMapper.updateOrderRefund(refundRaram);//更新订单退款信息
|
|
|
- }
|
|
|
+ /**
|
|
|
+ * 微信支付、平安支付、线下扫码支付共用微信查询订单api
|
|
|
+ * @param map
|
|
|
+ */
|
|
|
+ private void wxRefundquery(Map map){
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxRefundquery 微信退款查询接口调用");
|
|
|
+ String out_trade_no = MapUtils.getString("merch_order_sn", map);
|
|
|
+ String order_id = MapUtils.getString("order_id", map);
|
|
|
+ String order_sn_wx = MapUtils.getString("order_sn_wx", map);
|
|
|
+ Integer is_onffline_order = MapUtils.getInteger("is_onffline_order", map);
|
|
|
+ if (is_onffline_order == 1) {
|
|
|
+ out_trade_no = order_sn_wx;
|
|
|
+ }
|
|
|
+ WechatRefundQueryResult result = WechatUtil.wxRefundquery(out_trade_no);
|
|
|
+ if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ Map refundRaram = new HashMap();
|
|
|
+ int msgCount = Integer.parseInt(result.getRefund_count());
|
|
|
+ for (int i = 0; i < msgCount; i++) {
|
|
|
+ WechatRefundQueryResult querySuccessResponseDto =
|
|
|
+ ReaderXmlForDOM4J.parse(result.getXmlStr(), i);
|
|
|
+ if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ result.setRefund_success_time(querySuccessResponseDto.getRefund_success_time());
|
|
|
+ result.setOut_refund_no(querySuccessResponseDto.getOut_refund_no());
|
|
|
+ result.setRefund_account(querySuccessResponseDto.getRefund_account());
|
|
|
+ result.setRefund_channel(querySuccessResponseDto.getRefund_channel());
|
|
|
+ result.setRefund_fee(querySuccessResponseDto.getRefund_fee());
|
|
|
+ result.setRefund_id(querySuccessResponseDto.getRefund_id());
|
|
|
+ result.setRefund_recv_accout(querySuccessResponseDto.getRefund_recv_accout());
|
|
|
+ result.setRefund_status(querySuccessResponseDto.getRefund_status());
|
|
|
+
|
|
|
+ Date successTime = DateUtils.strToDate(result.getRefund_success_time());
|
|
|
+ refundRaram.put("refundTime", successTime);
|
|
|
+ refundRaram.put("outRefundNo", result.getOut_refund_no());
|
|
|
+ refundRaram.put("refundId", result.getRefund_id());
|
|
|
+ refundRaram.put("refundMoney",
|
|
|
+ BigDecimal.valueOf(Long.valueOf(result.getRefund_fee()))
|
|
|
+ .divide(Constant.ONE_HUNDRED));
|
|
|
+ if (result.getRefund_status().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ refundRaram.put("refundStatus", 2);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款成功");
|
|
|
+ } else if (result.getRefund_status().equalsIgnoreCase("REFUNDCLOSE")) {
|
|
|
+ refundRaram.put("refundStatus", 4);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款关闭");
|
|
|
+ } else if (result.getRefund_status().equalsIgnoreCase("CHANGE")) {
|
|
|
+ refundRaram.put("refundStatus", 4);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款异常");
|
|
|
+ } else if (result.getRefund_status().equalsIgnoreCase("PROCESSING")) {
|
|
|
+ refundRaram.put("refundStatus", 5);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款处理中");
|
|
|
}
|
|
|
+ refundRaram.put("refundRecvAccout", result.getRefund_recv_accout());
|
|
|
+ refundRaram.put("orderRefundId", result.getOut_refund_no());
|
|
|
+ qzOrderMapper.updateOrderRefund(refundRaram);//更新订单退款信息
|
|
|
}
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
- Map orderRaram = new HashMap();
|
|
|
- orderRaram.put("payStatus", 4);
|
|
|
- orderRaram.put("orderStatus", 401);
|
|
|
- orderRaram.put("orderId", order_id);
|
|
|
- orderRaram.put("payTransactionId", result.getTransaction_id());
|
|
|
- qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
- } else {
|
|
|
- logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate 微信退款查询接口返回失败信息：code 【" + result.getErr_code() +
|
|
|
- "】，des【" + result.getErr_code_des() + "】");
|
|
|
+ Map orderRaram = new HashMap();
|
|
|
+ orderRaram.put("payStatus", 4);
|
|
|
+ orderRaram.put("orderStatus", 401);
|
|
|
+ orderRaram.put("orderId", order_id);
|
|
|
+ orderRaram.put("payTransactionId", result.getTransaction_id());
|
|
|
+ qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxRefundquery 微信退款查询接口返回失败信息：code 【" + result.getErr_code() +
|
|
|
+ "】，des【" + result.getErr_code_des() + "】");
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxRefundquery 微信退款查询接口调用失败： " + result.getReturn_msg());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 微信国际支付微信查询订单api
|
|
|
+ * @param map
|
|
|
+ */
|
|
|
+ private void wxGlobalRefundQuery(Map map){
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalRefundQuery 微信国际退款查询接口调用");
|
|
|
+ String out_trade_no = MapUtils.getString("merch_order_sn", map);
|
|
|
+ String order_id = MapUtils.getString("order_id", map);
|
|
|
+ WechatGlobalRefundQueryResult result = WechatGlobalUtil.wxRefundquery(out_trade_no);
|
|
|
+ if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ Map refundRaram = new HashMap();
|
|
|
+ int msgCount = Integer.parseInt(result.getRefund_count());
|
|
|
+ for (int i = 0; i < msgCount; i++) {
|
|
|
+ //微信部分退款时返回的多条退款信息数据解析
|
|
|
+ WechatRefundQueryResult querySuccessResponseDto = ReaderXmlForDOM4J.parse(result.getXmlStr(), i);
|
|
|
+ if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ //微信部分退款时返回的多条退款信息数据
|
|
|
+ result.setRefund_fee(querySuccessResponseDto.getRefund_fee());
|
|
|
+ result.setOut_refund_no(querySuccessResponseDto.getOut_refund_no());
|
|
|
+ result.setRefund_id(querySuccessResponseDto.getRefund_id());
|
|
|
+ result.setRefund_channel(querySuccessResponseDto.getRefund_channel());
|
|
|
+ result.setRefund_status(querySuccessResponseDto.getRefund_status());
|
|
|
+ result.setRefund_account(querySuccessResponseDto.getRefund_account());
|
|
|
+ result.setRefund_recv_accout(querySuccessResponseDto.getRefund_recv_accout());
|
|
|
+ result.setRefund_success_time(querySuccessResponseDto.getRefund_success_time());
|
|
|
+
|
|
|
+ refundRaram.put("refundTime", DateUtils.strToDate(result.getRefund_success_time()));
|
|
|
+ refundRaram.put("outRefundNo", result.getOut_refund_no());
|
|
|
+ refundRaram.put("refundId", result.getRefund_id());
|
|
|
+ refundRaram.put("refundMoney",
|
|
|
+ BigDecimal.valueOf(Long.valueOf(result.getRefund_fee()))
|
|
|
+ .divide(Constant.ONE_HUNDRED));//退款金额
|
|
|
+ refundRaram.put("totalFee", result.getTotal_fee());//标价金额
|
|
|
+ refundRaram.put("feeType", result.getFee_type());//标价币种
|
|
|
+ refundRaram.put("cashFee", result.getCash_fee());//用户支付金额
|
|
|
+ refundRaram.put("cashFeeType", result.getCash_fee_type());//用户支付金额币种
|
|
|
+ refundRaram.put("rate", result.getRate());//汇率
|
|
|
+ if (result.getRefund_status().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ refundRaram.put("refundStatus", 2);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款成功");
|
|
|
+ } else if (result.getRefund_status().equalsIgnoreCase("PROCESSING")) {
|
|
|
+ refundRaram.put("refundStatus", 5);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款处理中");
|
|
|
+ } else if (result.getRefund_status().equalsIgnoreCase("REFUNDCLOSE")) {
|
|
|
+ refundRaram.put("refundStatus", 4);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款关闭");
|
|
|
+ } else if (result.getRefund_status().equalsIgnoreCase("CHANGE")) {
|
|
|
+ refundRaram.put("refundStatus", 4);
|
|
|
+ refundRaram.put("wechat_refund_status_des", "退款异常");
|
|
|
+ }
|
|
|
+ refundRaram.put("refundRecvAccout", result.getRefund_recv_accout());
|
|
|
+ refundRaram.put("orderRefundId", result.getOut_refund_no());
|
|
|
+ qzOrderMapper.updateOrderRefund(refundRaram);//更新订单退款信息
|
|
|
+ }
|
|
|
}
|
|
|
- } else {
|
|
|
- logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate 微信退款查询接口调用失败： " + result.getReturn_msg());
|
|
|
}
|
|
|
+ Map orderRaram = new HashMap();
|
|
|
+ orderRaram.put("payStatus", 4);
|
|
|
+ orderRaram.put("orderStatus", 401);
|
|
|
+ orderRaram.put("orderId", order_id);
|
|
|
+ orderRaram.put("payTransactionId", result.getTransaction_id());
|
|
|
+ qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalRefundQuery 微信国际退款查询接口返回失败信息：code 【" + result.getErr_code() +
|
|
|
+ "】，des【" + result.getErr_code_des() + "】");
|
|
|
}
|
|
|
} else {
|
|
|
- logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate 未查到退款数据 ");
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalRefundQuery 微信国际退款查询接口调用失败： " + result.getReturn_msg());
|
|
|
}
|
|
|
- logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate is end ");
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -310,50 +403,16 @@ public class QzOrderService {
|
|
|
List<Map> orderList = qzOrderMapper.queryPayingOrderList();
|
|
|
if (null != orderList && orderList.size() > 0) {
|
|
|
for (Map map : orderList) {
|
|
|
- String out_trade_no = MapUtils.getString("merch_order_sn", map);
|
|
|
+ String pay_flag = MapUtils.getString("pay_flag", map);
|
|
|
String orderId = MapUtils.getString("order_id", map);
|
|
|
- String add_time = MapUtils.getString("add_time", map);
|
|
|
- Integer number = MapUtils.getInteger("number", map);
|
|
|
- Integer stock_num = MapUtils.getInteger("stock_num", map);
|
|
|
- Long storeRelaId = MapUtils.getLong("storeRelaId", map);
|
|
|
-
|
|
|
- Date addTime = DateUtils.strToDate(add_time);
|
|
|
- Date nowDate = new Date();
|
|
|
- WechatRefundApiResult result = WechatUtil.wxOrderQuery(out_trade_no);
|
|
|
- if (result.getReturn_code().equalsIgnoreCase("SUCCESS")) {
|
|
|
- if (result.getResult_code().equalsIgnoreCase("SUCCESS") &&
|
|
|
- result.getTrade_state().equalsIgnoreCase("SUCCESS")) {
|
|
|
- Date successTime = DateUtils.convertStringToDate(result.getTime_end(),
|
|
|
- DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD_HH_MM_SS);
|
|
|
- Map orderRaram = new HashMap();
|
|
|
- orderRaram.put("payStatus", 2);//已支付
|
|
|
- orderRaram.put("orderStatus", 201);//已支付
|
|
|
- orderRaram.put("payTransactionId", result.getTransaction_id());
|
|
|
- orderRaram.put("payTime", successTime);
|
|
|
- orderRaram.put("orderId", orderId);
|
|
|
- qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
- } else if (result.getResult_code().equalsIgnoreCase("SUCCESS") &&
|
|
|
- result.getTrade_state().equalsIgnoreCase("NOTPAY")) {//订单未支付
|
|
|
- Map orderRaram = new HashMap();
|
|
|
- if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
|
|
|
- orderRaram.put("payStatus", 0);//支付状态未支付
|
|
|
- orderRaram.put("orderStatus", 101);//订单状态已取消
|
|
|
- Map param = new HashMap();
|
|
|
- param.put("id", storeRelaId);
|
|
|
- param.put("stock_num", stock_num + number);
|
|
|
- qzOrderMapper.updateStockNum(param);
|
|
|
- } else {
|
|
|
- orderRaram.put("payStatus", 0);//支付状态未支付
|
|
|
- orderRaram.put("orderStatus", 0);//订单状态未支付
|
|
|
- }
|
|
|
- orderRaram.put("orderId", orderId);
|
|
|
- qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
- } else {
|
|
|
- logger.info(">>>>>>>>>>>>>>>>>>>>orderQueryUpdate 微信查询接口返回失败信息：code 【" + result.getErr_code() +
|
|
|
- "】，des【" + result.getErr_code_des() + "】");
|
|
|
+ if(org.apache.commons.lang.StringUtils.isNotEmpty(pay_flag)) {
|
|
|
+ if (pay_flag.equalsIgnoreCase("wxglobalpay")) {//微信国际支付
|
|
|
+ wxGlobalOrderQuery(map);
|
|
|
+ } else {//微信支付、平安支付、线下扫码支付
|
|
|
+ wxOrderQuery(map);
|
|
|
}
|
|
|
- } else {
|
|
|
- logger.info(">>>>>>>>>>>>>>>>>>>>orderQueryUpdate 微信查询接口调用失败： " + result.getReturn_msg());
|
|
|
+ }else{
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>refundUpdate 订单编号【"+orderId+"】的支付方式不能为空！ ");
|
|
|
}
|
|
|
}
|
|
|
} else {
|
|
|
@@ -362,6 +421,117 @@ public class QzOrderService {
|
|
|
logger.info(">>>>>>>>>>>>>>>>>>>>orderQueryUpdate is end ");
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 微信查询接口
|
|
|
+ * @param map
|
|
|
+ */
|
|
|
+ private void wxOrderQuery(Map map){
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxOrderQuery 微信查询接口调用");
|
|
|
+ String out_trade_no = MapUtils.getString("merch_order_sn", map);
|
|
|
+ String orderId = MapUtils.getString("order_id", map);
|
|
|
+ String add_time = MapUtils.getString("add_time", map);
|
|
|
+ Integer number = MapUtils.getInteger("number", map);
|
|
|
+ Integer stock_num = MapUtils.getInteger("stock_num", map);
|
|
|
+ Long storeRelaId = MapUtils.getLong("storeRelaId", map);
|
|
|
+ Date addTime = DateUtils.strToDate(add_time);
|
|
|
+ Date nowDate = new Date();
|
|
|
+
|
|
|
+ WechatRefundApiResult result = WechatUtil.wxOrderQuery(out_trade_no);
|
|
|
+ if (result.getReturn_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ if (result.getResult_code().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode()) &&
|
|
|
+ result.getTrade_state().equalsIgnoreCase(WechatUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ Date successTime = DateUtils.convertStringToDate(result.getTime_end(),
|
|
|
+ DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD_HH_MM_SS);
|
|
|
+ Map orderRaram = new HashMap();
|
|
|
+ orderRaram.put("payStatus", 2);//已支付
|
|
|
+ orderRaram.put("orderStatus", 201);//已支付
|
|
|
+ orderRaram.put("payTransactionId", result.getTransaction_id());
|
|
|
+ orderRaram.put("payTime", successTime);
|
|
|
+ orderRaram.put("orderId", orderId);
|
|
|
+ qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
+ } else if (result.getResult_code().equalsIgnoreCase("SUCCESS") &&
|
|
|
+ result.getTrade_state().equalsIgnoreCase("NOTPAY")) {//订单未支付
|
|
|
+ Map orderRaram = new HashMap();
|
|
|
+ if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
|
|
|
+ orderRaram.put("payStatus", 0);//支付状态未支付
|
|
|
+ orderRaram.put("orderStatus", 101);//订单状态已取消
|
|
|
+ Map param = new HashMap();
|
|
|
+ param.put("id", storeRelaId);
|
|
|
+ param.put("stock_num", stock_num + number);
|
|
|
+ qzOrderMapper.updateStockNum(param);
|
|
|
+ } else {
|
|
|
+ orderRaram.put("payStatus", 0);//支付状态未支付
|
|
|
+ orderRaram.put("orderStatus", 0);//订单状态未支付
|
|
|
+ }
|
|
|
+ orderRaram.put("orderId", orderId);
|
|
|
+ qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxOrderQuery 微信查询接口返回失败信息：code 【" + result.getErr_code() +
|
|
|
+ "】，des【" + result.getErr_code_des() + "】");
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxOrderQuery 微信查询接口调用失败： " + result.getReturn_msg());
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 微信国际查询接口
|
|
|
+ * @param map
|
|
|
+ */
|
|
|
+ private void wxGlobalOrderQuery(Map map){
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalOrderQuery 微信查询接口调用");
|
|
|
+ String out_trade_no = MapUtils.getString("merch_order_sn", map);
|
|
|
+ String orderId = MapUtils.getString("order_id", map);
|
|
|
+ String add_time = MapUtils.getString("add_time", map);
|
|
|
+ Integer number = MapUtils.getInteger("number", map);
|
|
|
+ Integer stock_num = MapUtils.getInteger("stock_num", map);
|
|
|
+ Long storeRelaId = MapUtils.getLong("storeRelaId", map);
|
|
|
+ Date addTime = DateUtils.strToDate(add_time);
|
|
|
+ Date nowDate = new Date();
|
|
|
+
|
|
|
+ WechatGlobalQueryApiResult result = WechatGlobalUtil.wxOrderQuery(out_trade_no);
|
|
|
+ if (result.getReturn_code().equalsIgnoreCase(WechatGlobalUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ if (result.getResult_code().equalsIgnoreCase(WechatGlobalUtil.WXTradeState.SUCCESS.getCode()) &&
|
|
|
+ result.getTrade_state().equalsIgnoreCase(WechatGlobalUtil.WXTradeState.SUCCESS.getCode())) {
|
|
|
+ Date successTime = DateUtils.convertStringToDate(result.getTime_end(),
|
|
|
+ DateUtils.DATE_TIME_PATTERN_YYYY_MM_DD_HH_MM_SS);
|
|
|
+ Map orderRaram = new HashMap();
|
|
|
+ orderRaram.put("payStatus", 2);//已支付
|
|
|
+ orderRaram.put("orderStatus", 201);//已支付
|
|
|
+ orderRaram.put("payTransactionId", result.getTransaction_id());
|
|
|
+ orderRaram.put("payTime", successTime);
|
|
|
+ orderRaram.put("orderId", orderId);
|
|
|
+
|
|
|
+ orderRaram.put("totalFee", result.getTotal_fee());//标价金额
|
|
|
+ orderRaram.put("feeType", result.getFee_type());//标价币种
|
|
|
+ orderRaram.put("cashFee", result.getCash_fee());//用户支付金额
|
|
|
+ orderRaram.put("cashFeeType", result.getCash_fee_type());//用户支付金额币种
|
|
|
+ orderRaram.put("rate", result.getRate());//汇率
|
|
|
+ qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
+ } else if (result.getResult_code().equalsIgnoreCase(WechatGlobalUtil.WXTradeState.SUCCESS.getCode()) &&
|
|
|
+ result.getTrade_state().equalsIgnoreCase("NOTPAY")) {//订单未支付
|
|
|
+ Map orderRaram = new HashMap();
|
|
|
+ if (getDateBetween(addTime, nowDate) >= 15) {//订单下单时间超过15分钟直接取消订单
|
|
|
+ Map param = new HashMap();
|
|
|
+ param.put("id", storeRelaId);
|
|
|
+ param.put("stock_num", stock_num + number);
|
|
|
+ qzOrderMapper.updateStockNum(param);
|
|
|
+ orderRaram.put("payStatus", 0);//支付状态未支付
|
|
|
+ orderRaram.put("orderStatus", 101);//订单状态已取消
|
|
|
+ } else {
|
|
|
+ orderRaram.put("payStatus", 0);//支付状态未支付
|
|
|
+ orderRaram.put("orderStatus", 0);//订单状态未支付
|
|
|
+ }
|
|
|
+ orderRaram.put("orderId", orderId);
|
|
|
+ qzOrderMapper.updateOrderInfo(orderRaram);
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalOrderQuery 微信查询接口返回失败信息：code 【" + result.getErr_code() +
|
|
|
+ "】，des【" + result.getErr_code_des() + "】");
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ logger.info(">>>>>>>>>>>>>>>>>>>>wxGlobalOrderQuery 微信查询接口调用失败： " + result.getReturn_msg());
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
|
* 查询付款码支付记录的支付状态
|
|
|
@@ -382,7 +552,7 @@ public class QzOrderService {
|
|
|
Integer id = MapUtils.getInteger("id", map);
|
|
|
|
|
|
WechatRefundApiResult result = WechatUtil.wxOrderQuery(out_trade_no_wx);
|
|
|
- if ("SUCCESS".equals(result.getReturn_code()) && "SUCCESS".equals(result.getResult_code())) {
|
|
|
+ if (WechatUtil.WXTradeState.SUCCESS.getCode().equals(result.getReturn_code()) && WechatUtil.WXTradeState.SUCCESS.getCode().equals(result.getResult_code())) {
|
|
|
Map recordRaram = new HashMap();
|
|
|
recordRaram.put("id", id);
|
|
|
recordRaram.put("trade_state", result.getTrade_state());
|
|
|
@@ -468,6 +638,9 @@ public class QzOrderService {
|
|
|
logger.info(">>>>>>>>>>>>>>>>>>>>查询付款码支付记录的支付状态 结束<<<<<<<<<<<<<<<<<<<<<<<");
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 商品发货后7天自动确认收货
|
|
|
+ */
|
|
|
@Transactional
|
|
|
public void shipmentOrderAutoTakeGoods() {
|
|
|
logger.info(">>>>>>>>>>>>>>>>>>>>shipmentOrderAutoTakeGoods is start ");
|
|
|
@@ -493,6 +666,9 @@ public class QzOrderService {
|
|
|
logger.info(">>>>>>>>>>>>>>>>>>>>shipmentOrderAutoTakeGoods is end ");
|
|
|
}
|
|
|
|
|
|
+ /**
|
|
|
+ * 确认收货后30天自动确认好评
|
|
|
+ */
|
|
|
@Transactional
|
|
|
public void receiptOrderAutoComment() {
|
|
|
logger.info(">>>>>>>>>>>>>>>>>>>>receiptOrderAutoComment is start ");
|
hyq