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

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;
@@ -217,8 +217,8 @@ public class DragonConstant {
      * MYSQL_REDIS_QUEUE
      */
     public enum MysqlRedisQueueEnum{
-        DRAGON_PAY_KEY("dragon-pay","同步数据-支付"),
-        DRAGON_REFUND_KEY ("dragon-refund","同步数据-退款"),
+        DRAGON_PAY_KEY("dragon:stream:dragon-pay","同步数据-支付"),
+        DRAGON_REFUND_KEY ("dragon:stream:dragon-refund","同步数据-退款"),
         DRAGON_PAY_GROUP("dragon-pay-group","同步数据-支付-组"),
         DRAGON_REFUND_GROUP ("dragon-refund-group","同步数据-退款-组");
         private String code;

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-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -56,10 +56,13 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
     @Override
 //    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Exception.class)
     public void edit(AdamUserInfoVo userInfoVo) {
+        userInfoVo.setCreateAt(null);
+        Document updateDoc = Document.parse(JsonUtils.toJson(userInfoVo));
+        updateDoc.replace("updatedAt", userInfoVo.getUpdatedAt());
         long s = System.currentTimeMillis();
         UpdateResult updateResult = mongoTemplate.getCollection(AdamUserInfoVo.class.getSimpleName()).updateOne(
                 Query.query(Criteria.where("uid").is(userInfoVo.getUid())).getQueryObject(),
-                new Document("$set", Document.parse(JsonUtils.toJson(userInfoVo)))
+                new Document("$set", updateDoc)
         );
         log.debug("#MDB耗时:{}ms", System.currentTimeMillis() - s);
         if (updateResult.getModifiedCount() <= 0) {

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,31 +12,38 @@ 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);
         }
     }
-    
-    public DragonOrdersDto getPayOrderByCode(String code){
+
+    public DragonOrdersDto getPayOrderByCode(String code) {
         if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_CODE + code)) {
             //TODO 是否降级处理
         }
         return (DragonOrdersDto) redisUtil.get(DragonConstant.REDIS_KET_PAY_CODE + code);
     }
 
-    public DragonOrdersDto getPayOrderByOrderCode(String orderCode){
+    public DragonOrdersDto getPayOrderByOrderCode(String orderCode) {
         if (!redisUtil.hasKey(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode)) {
             //TODO 是否降级处理
-        } 
+        }
         //获取支付订单号
-        String code = (String)redisUtil.get(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode);
-        
+        String code = (String) redisUtil.get(DragonConstant.REDIS_KET_PAY_ORDERCODE + orderCode);
+
         return (DragonOrdersDto) redisUtil.get(DragonConstant.REDIS_KET_PAY_CODE + code);
     }
 
-    public void updateOrderStatus(String code,DragonOrdersDto dragonOrdersDto){
+    public void updateOrderStatus(String code, DragonOrdersDto dragonOrdersDto) {
         redisUtil.set(DragonConstant.REDIS_KET_PAY_CODE + code, dragonOrdersDto);
     }
+
+    public void setRefundNotifyUrl(String code, String notifyUrl) {
+        redisUtil.set(DragonConstant.REFUND_REDIS_KET + code, notifyUrl);
+    }
+
+    public String getRefundNotifyUrl(String code) {
+        return (String) redisUtil.get(DragonConstant.REFUND_REDIS_KET + code);
+    }
 }

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

@@ -87,4 +87,30 @@ public class MqHandleUtil {
             return false;
         }
     }
+
+    /**
+     * 给 REDIS 队列发送消息 数据库相关
+     *
+     * @param sql  sql语句
+     * @param data 需要操作的数据
+     * @return
+     */
+    public boolean sendMySqlRedis(String sql, Object[] data , String redisKey) {
+        try {
+            LinkedList<String> sqls = new LinkedList<>();
+            sqls.add(sql);
+            LinkedList<Object[]> sqlsData = new LinkedList();
+            sqlsData.add(data);
+            String sqlData = SqlMapping.gets(sqls, sqlsData);
+
+            HashMap<String, String> map = new HashMap<>();
+            map.put("message", sqlData);
+            MapRecord<String, String, String> record = StreamRecords.mapBacked(map).withStreamKey(redisKey);
+            stringRedisTemplate.opsForStream().add(record);
+            return true;
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+    }
 }