Merge remote-tracking branch 'origin/douYinPay' into douYinPay

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

@@ -18,6 +18,7 @@ public class DragonConstant {
 
 
     public static final String REFUND_REDIS_KET="dragon:refund:refundCode:";// 订单号对应回调地址
+    public static final String ORDERCODE_REDIS_KET="dragon:refund:orderCode:";// 退款订单号对应 支付订单号
     public static final String REDIS_KET_PAY_CODE="dragon:pay:code:";// 支付流水号
 
     public enum PayChannelEnum{

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -14,8 +14,8 @@ liquidnet:
     blacklist_grace_period: 5
   mysql:
     urlHostAndPort: 39.107.71.112:3308
-    username: testmall
-    password: zhengzai!mYT
+    username: root
+    password: Zhengzai@rd2U#
   rabbitmq:
     host: rabbitmq.zhengzai.tv
     port: 5672

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

@@ -103,6 +103,7 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                         dto = weyPayRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localWePayCallBackUrl, nowTime);
                         break;
                     case DragonConstant.REFUND_TYPE_APPLET_DOUYIN:
+                        dataUtils.setOrderCode(orderRefundCode,orderCode);
                         dto = douYinRefund(code, orderRefundCode, code, reason, price, priceTotal, paymentId, paymentType, localDouYinCallBackUrl, nowTime);
                         break;
                 }
@@ -483,12 +484,12 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                 }
                 //开发者自定义的退款单号
                 dto.setOrderRefundCode(msg.getString("cp_refundno"));
-                //  没有订单号
-                dto.setRefundCode("");
+                //  没有订单号 从redids里面查
+                dto.setRefundCode(dataUtils.getOrderCode(msg.getString("cp_refundno")));
                 dto.setRefundPrice(msg.getBigDecimal("refund_amount").divide(BigDecimal.valueOf(100)).toString());
                // SimpleDateFormat sdf =   new SimpleDateFormat( " yyyy年MM月dd日 " );
                 // 抖音没有传回时间
-                //dto.setRefundAt(sdf.format(new Date()));
+                dto.setRefundAt(DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now()));
                 //抖音回调没有写错误原因
                 dto.setRefundError("");
                 log.info("SEND DOUYINPAY NOTIFTURL = " + JSON.toJSONString(dto));
@@ -555,15 +556,14 @@ public class DragonOrderRefundsServiceImpl implements IDragonOrderRefundsService
                 //开发者自定义的退款单号
                 dto.setOrderRefundCode(refundInfo.getString("refund_no"));
                 //  没有订单号
-                dto.setRefundCode("");
+                dto.setRefundCode(dataUtils.getOrderCode(refundInfo.getString("cp_refundno")));
                 dto.setRefundPrice(refundInfo.getBigDecimal("refund_amount").divide(BigDecimal.valueOf(100)).toString());
-                SimpleDateFormat sdf =   new SimpleDateFormat( " yyyy年MM月dd日 " );
                 // 抖音没有传回时间
-                dto.setRefundAt(sdf.format(new Date()));
+                dto.setRefundAt(DateUtil.Formatter.yyyyMMddHHmmss.format(LocalDateTime.now()));
                 //抖音回调没有写错误原因
                 dto.setRefundError("");
                 log.info("SEND DOUYINPAY NOTIFTURL = " + JSON.toJSONString(dto));
-               // sendNotifyUrl(dto, null);
+                sendNotifyUrl(dto, null);
                 //创建退款订单日志
                 mqHandleUtil.sendMySqlRedis(
                         SqlMapping.get("dragon_order_refund_log.insert"),

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

@@ -32,6 +32,18 @@ public class DataUtils {
     public void setRefundNotifyUrl(String code, String notifyUrl) {
         redisUtil.set(DragonConstant.REFUND_REDIS_KET + code, notifyUrl,keyExpireTime);
     }
+    /**
+     * @author zhangfuxin
+     * @Description:通过退款订单号找到 支付订单号
+     * @date 2021/12/3 上午11:45
+     */
+    public void setOrderCode(String refundCode,String orderCode){
+        redisUtil.set(DragonConstant.ORDERCODE_REDIS_KET + refundCode, orderCode,keyExpireTime);
+    }
+    public String getOrderCode(String refundCode){
+        //redisUtil.set(DragonConstant.ORDERCODE_REDIS_KET + refundCode, orderCode,keyExpireTime);
+        return (String) redisUtil.get(DragonConstant.ORDERCODE_REDIS_KET + refundCode);
+    }
 
     public String getRefundNotifyUrl(String code) {
         return (String) redisUtil.get(DragonConstant.REFUND_REDIS_KET + code);