提交支付查询

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

@@ -141,7 +141,7 @@ public class DragonConstant {
     public enum PayTypeEnum{
         PAYMENT_TYPE_APP_ALIPAY("APPALIPAY","alipay","app","App内支付宝支付"),
         PAYMENT_TYPE_APP_WEPAY("APPWEPAY","wepay","app","App内微信支付"),
-        PAYMENT_TYPE_APP_IAP("APPIAP","applepay","app","App内IAP(In-App Purchase)支付，iOS虚拟道具支付"),
+        PAYMENT_TYPE_APP_IAP("APPIAP","iap","app","App内IAP(In-App Purchase)支付，iOS虚拟道具支付"),
         PAYMENT_TYPE_WAP_ALIPAY("WAPALIPAY","alipay","wap","手机网页内支付宝支付"),
         PAYMENT_TYPE_WAP_WEPAY("WAPWEPAY","wepay","wap","手机网页调起微信支付"),
         PAYMENT_TYPE_WEB_ALIPAY("WEBALIPAY","alipay","web","电脑网页内支付宝即时到账支付"),
@@ -153,7 +153,7 @@ public class DragonConstant {
         private String message;
         private String payType;
         private String deviceFrom;
-        PayTypeEnum(String code, String message,String payType,String deviceFrom) {
+        PayTypeEnum(String code,String payType,String deviceFrom,String message) {
             this.code = code;
             this.message = message;
             this.payType = payType;

liquidnet-bus-api/liquidnet-service-dragon-api/src/main/java/com/liquidnet/service/dragon/dto/DragonPayBaseReqDto.java

 package com.liquidnet.service.dragon.dto;
 
+import com.alibaba.fastjson.JSON;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -31,4 +32,9 @@ public class DragonPayBaseReqDto {
     private String quitUrl;
     private String showUrl;
     private String returnUrl;
+
+    @Override
+    public String toString(){
+        return JSON.toJSONString(this);
+    }
 }

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

@@ -44,7 +44,7 @@ public abstract class DragonPayBiz {
         orders.setOrderCode(dragonPayBaseReqDto.getOrderCode());
         orders.setClientIp(dragonPayBaseReqDto.getClientIp());
         orders.setNotifyUrl(dragonPayBaseReqDto.getNotifyUrl());
-        orders.setPaymentType(DragonConstant.PayTypeEnum.PAYMENT_TYPE_APP_IAP.getCode());
+        orders.setPaymentType((dragonPayBaseReqDto.getDeviceFrom()+dragonPayBaseReqDto.getPayType()).toUpperCase());
 //        orders.setPaymentId();
         orders.setPaymentAt(LocalDateTime.now());
 //        orders.setFinishedAt();

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

@@ -36,6 +36,7 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
     public ResponseDto<DragonPayBaseRespDto> dragonPay(DragonPayBaseReqDto dragonPayBaseReqDto) {
         //设置支付编号
         dragonPayBaseReqDto.setCode(IDGenerator.payCode());
+        log.info("dragon:dragonPay:req:dragonPayBaseReqDto : {}",dragonPayBaseReqDto.toString());
         return payChannelStrategyContext.getStrategy(dragonPayBaseReqDto.getPayType()).dragonPay(dragonPayBaseReqDto);
     }
 
@@ -50,7 +51,8 @@ public class DragonOrdersServiceImpl implements IDragonOrdersService {
         if(StringUtil.isEmpty(ordersDto)){
             throw new LiquidnetServiceException(DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getCode(),DragonErrorCodeEnum.TRADE_ERROR_NOT_EXISTS.getMessage());
         }
-        return payChannelStrategyContext.getStrategy(DragonConstant.PayTypeEnum.getEnumByCode(ordersDto.getPaymentType()).getPayType()).checkOrderStatus(code);
+        String payType = DragonConstant.PayTypeEnum.getEnumByCode(ordersDto.getPaymentType()).getPayType();
+        return payChannelStrategyContext.getStrategy(payType).checkOrderStatus(code);
     }
 
     @Override

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

@@ -12,8 +12,7 @@ public class DataUtils {
     private RedisUtil redisUtil;
 
     public void createPayOrder(String orderCode, String code, DragonOrdersDto ordersDto) {
-        if (redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode)) {
-        } else {
+        if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode)) {
             redisUtil.set(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode, code);
             redisUtil.set(DragonConstant.REDIS_KET_PAY_CODE + code, ordersDto);
         }