修改支付通知逻辑

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/constant/DragonErrorCodeEnum.java

@@ -27,7 +27,9 @@ public enum DragonErrorCodeEnum {
 
     TRADE_ALIPAY_QUERY_ERROR("PAY0010010","支付宝订单查询失败！"),
 
-    TRADE_WEPAY_SIGN_ERROR("PAY0020001","微信签名异常！");
+    TRADE_WEPAY_SIGN_ERROR("PAY0020001","微信签名异常！"),
+
+    TRADE_WEPAY_QUERY_ERROR("PAY0020002","微信订单查询失败！");
 
     private String code;
     private String message;

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/strategy/impl/PayChannelStrategyAlipayImpl.java

@@ -152,7 +152,8 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
             throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ALIPAY_QUERY_ERROR.getCode(),DragonErrorCodeEnum.TRADE_ALIPAY_QUERY_ERROR.getMessage());
         }
         // 当返回状态为“TRADE_FINISHED”交易成功结束和“TRADE_SUCCESS”支付成功时更新交易状态
-        if ("TRADE_SUCCESS".equals(resultMap.get("tradeStatus")) || "TRADE_FINISHED".equals(resultMap.get("tradeStatus"))) {
+        if (AlipayConstant.AlipayTradeStateEnum.TRADE_SUCCESS.getCode().equals(resultMap.get("tradeStatus"))
+                || AlipayConstant.AlipayTradeStateEnum.TRADE_FINISHED.getCode().equals(resultMap.get("tradeStatus"))) {
             respDto.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_PAID.getCode()));
         }
         return respDto;

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/biz/WepayBiz.java

 package com.liquidnet.service.dragon.channel.wepay.biz;
 
-import com.liquidnet.service.dragon.channel.wepay.resp.WepayOrderQueryRespDto;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import com.liquidnet.service.dragon.utils.XmlUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -12,6 +11,8 @@ import org.apache.http.util.EntityUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -35,9 +36,9 @@ public class WepayBiz{
      *
      * @return
      */
-    public WepayOrderQueryRespDto tradeQuery(String outTradeNo,String appid) {
+    public Map<String, Object> tradeQuery(String outTradeNo, String appid) {
+        Map<String, Object> respMap = new HashMap<>();
         log.info("======>支付宝交易查询");
-        WepayOrderQueryRespDto respDto = null;
         SortedMap<String, Object> paramMap = new TreeMap<>();
         paramMap.put("appid", appid);
         paramMap.put("mch_id", merchantId);
@@ -57,11 +58,11 @@ public class WepayBiz{
             String xmlStr = EntityUtils.toString(response.getEntity(), "UTF-8");
             EntityUtils.consume(entity);
             log.info("dragonPay:wepay:wap response xmlStr: {} ",xmlStr);
-            respDto = XmlUtil.toBean(xmlStr, WepayOrderQueryRespDto.class);
+            respMap = XmlUtil.xmlToMap(xmlStr);
         }catch (Exception e){
             log.error(e.getMessage());
         }
 
-        return respDto;
+        return respMap;
     }
 }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/channel/wepay/strategy/impl/AbstractWepayStrategy.java

@@ -4,15 +4,18 @@ import com.liquidnet.common.exception.LiquidnetServiceException;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.dragon.biz.DragonServiceCommonBiz;
+import com.liquidnet.service.dragon.channel.strategy.biz.DragonPayBiz;
 import com.liquidnet.service.dragon.channel.wepay.biz.WepayBiz;
 import com.liquidnet.service.dragon.channel.wepay.constant.WepayConstant;
-import com.liquidnet.service.dragon.channel.wepay.resp.WepayOrderQueryRespDto;
 import com.liquidnet.service.dragon.channel.wepay.resp.WepayPayRespDto;
 import com.liquidnet.service.dragon.channel.wepay.strategy.IWepayStrategy;
+import com.liquidnet.service.dragon.constant.DragonConstant;
 import com.liquidnet.service.dragon.constant.DragonErrorCodeEnum;
+import com.liquidnet.service.dragon.dto.DragonOrdersDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseReqDto;
 import com.liquidnet.service.dragon.dto.DragonPayBaseRespDto;
 import com.liquidnet.service.dragon.dto.DragonPayOrderQueryRespDto;
+import com.liquidnet.service.dragon.utils.DataUtils;
 import com.liquidnet.service.dragon.utils.PayWepayUtils;
 import com.liquidnet.service.dragon.utils.XmlUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -26,6 +29,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 import java.time.ZoneOffset;
+import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
@@ -43,9 +47,15 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
     @Autowired
     private WepayBiz wepayBiz;
 
+    @Autowired
+    private DataUtils dataUtils;
+
     @Autowired
     private DragonServiceCommonBiz dragonServiceCommonBiz;
 
+    @Autowired
+    private DragonPayBiz dragonPayBiz;
+
     @Override
     public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
 
@@ -159,15 +169,19 @@ public abstract class AbstractWepayStrategy implements IWepayStrategy {
 
     @Override
     public DragonPayOrderQueryRespDto checkOrderStatus(String code) {
-        WepayOrderQueryRespDto result = wepayBiz.tradeQuery(code,this.getAppid());
-        DragonPayOrderQueryRespDto respDto = new DragonPayOrderQueryRespDto();
-        respDto.setCode(code);
-//        respDto.setOrderCode("");
-//        respDto.setStatus("");
-//        respDto.setType();
-//        respDto.setPaymentId();
-//        respDto.setPrice();
-//        respDto.setPaymentType();
+        DragonOrdersDto ordersDto = dataUtils.getPayOrderByCode(code);
+        Map<String, Object> resultMap = wepayBiz.tradeQuery(code,this.getAppid());
+        DragonPayOrderQueryRespDto respDto = dragonPayBiz.buildPayOrderQueryRespDto(ordersDto);
+
+        Object returnCode = resultMap.get("return_code");
+        // 查询失败
+        if (null == returnCode || "FAIL".equals(returnCode)) {
+            throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_WEPAY_QUERY_ERROR.getCode(),DragonErrorCodeEnum.TRADE_WEPAY_QUERY_ERROR.getMessage());
+        }
+        // 当trade_state为SUCCESS时才返回result_code
+        if ("SUCCESS".equals(resultMap.get("trade_state"))) {
+            respDto.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_PAID.getCode()));
+        }
         return respDto;
     }