修改验签问题。

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

@@ -158,7 +158,7 @@ public class PayChannelStrategyAlipayImpl extends AbstractPayChannelStrategyImpl
                     || AlipayConstant.AlipayTradeStateEnum.TRADE_FINISHED.getCode().equals(resultMap.get("tradeStatus"))) {
                 respDto.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_PAID.getCode()));
                 if(ordersDto.getPaymentType().equals(DragonConstant.PayTypeEnum.PAYMENT_TYPE_MICROPAY_ALIPAY.getCode())){
-                     this.completeSuccessOrder(ordersDto, resultMap.get("trade_no").toString(), LocalDateTime.now(), resultMap.toString());
+                    this.completeSuccessOrder(ordersDto, resultMap.get("tradeNo").toString(), LocalDateTime.now(), resultMap.toString());
                 }
             }else{
                 respDto.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_PAY_FAIL.getCode()));

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

@@ -111,7 +111,8 @@ public class WepayStrategyMicropayImpl extends AbstractWepayStrategy {
         }
         // 当trade_state为SUCCESS时才返回result_code
         if ("SUCCESS".equals(resultMap.get("trade_state"))) {
-            if(PayWepayUtils.getInstance().notifySign(resultMap, resultMap.get("sign"))){
+            String sign = resultMap.remove("sign");
+            if(PayWepayUtils.getInstance().notifySign(resultMap, sign)){
                 // 修改订单状态等。
                 payChannelStrategyWepay.completeSuccessOrder(dragonOrdersDto,resultMap.get("transaction_id"), LocalDateTime.now(),resultMap.toString());
                 respDto.setStatus(Integer.valueOf(DragonConstant.PayStatusEnum.STATUS_PAID.getCode()));

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/service/impl/DragonOrdersServiceImpl.java

@@ -55,11 +55,12 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
         if(StringUtil.isEmpty(ordersDto)){
             throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getCode(),DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getMessage());
         }
-        //如果已支付 直接返回结果
-        if(!ordersDto.getStatus().toString().equals(DragonConstant.PayStatusEnum.STATUS_UNPAID.getCode())){
+        //如果已支付 直接返回结果  // MICROPAYWEPAY  MICROPAYALIPAY
+        if(!ordersDto.getStatus().toString().equals(DragonConstant.PayStatusEnum.STATUS_UNPAID.getCode())&&!ordersDto.getPaymentType().equals("MICROPAYALIPAY")&&!ordersDto.getPaymentType().equals("MICROPAYWEPAY")){
+
             return dragonPayBiz.buildPayOrderQueryRespDto(ordersDto);
         }
-        //如果未支付进行三方查询
+        //如果未支付进行三方查询`
         String payType = DragonConstant.PayTypeEnum.getEnumByCode(ordersDto.getPaymentType()).getPayType();
         return payChannelStrategyContext.getStrategy(payType).checkOrderStatus(code);
     }

liquidnet-bus-service/liquidnet-service-dragon/liquidnet-service-dragon-impl/src/main/java/com/liquidnet/service/dragon/utils/PayWepayUtils.java

@@ -2,6 +2,7 @@ package com.liquidnet.service.dragon.utils;
 
 import com.alipay.api.internal.util.file.IOUtils;
 import com.liquidnet.commons.lang.util.MD5Utils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.http.client.config.RequestConfig;
 import org.apache.http.config.Registry;
 import org.apache.http.config.RegistryBuilder;
@@ -265,8 +266,13 @@ public class PayWepayUtils {
         SortedMap<String, Object> smap = new TreeMap<String, Object>(map);
         StringBuffer sb = new StringBuffer();
         for (Map.Entry<String, Object> m : smap.entrySet()) {
+            if(null!=m.getValue()){
+                if(StringUtils.isNotBlank(m.getValue().toString())){
                     sb.append(m.getKey()).append("=").append(m.getValue()).append("&");
                 }
+            }
+
+        }
         sb.delete(sb.length() - 1, sb.length());
         return sb.toString();
     }