Merge branch 'dev' into test

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

@@ -40,14 +40,14 @@ liquidnet:
       url-pay:
         pay: http://testpay.zhengzai.tv
         check: http://testpay.zhengzai.tv/order/verify
-        callback: http://adam.zhengzai.tv/adam/member/order/callback
+        callback: http://testadam.zhengzai.tv/adam/member/order/callback
       url-service:
         url: http://testservice.zhengzai.tv
     kylin:
       url-pay:
         pay: http://testpay.zhengzai.tv/
         check: http://testpay.zhengzai.tv/order/verify
-        localUrl: http://kylin.zhengzai.tv/kylin/order/syncOrder
+        localUrl: http://testkylin.zhengzai.tv/kylin/order/syncOrder
       url-service:
         url: http://testservice.zhengzai.tv/
     executor-main:
@@ -57,7 +57,7 @@ liquidnet:
   client:
     admin:
       phpPayUrl: http://testpay.zhengzai.tv
-      kylinApiUrl: https://kylin.zhengzai.tv
+      kylinApiUrl: https://testkylin.zhengzai.tv
       phpServiceUrl: https://testservice.zhengzai.tv
       phpoMediaApiUrl: https://testmediaapi.zhengzai.tv
       phpMallUrl: https://testmall.zhengzai.tv

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/docu/db_kylin_structure.sql

@@ -766,7 +766,7 @@ CREATE TABLE `kylin_order_refund_pic`
     `mid`              int unsigned NOT NULL AUTO_INCREMENT,
     `refund_pic_id`    varchar(255) NOT NULL DEFAULT '' COMMENT 'refund_pic_id',
     `order_refunds_id` varchar(255) NOT NULL DEFAULT '' COMMENT '订单退款表id',
-    `pic_url`          tinyint      NOT NULL DEFAULT '0' COMMENT '图片地址',
+    `pic_url`          varchar(255)      NOT NULL DEFAULT '' COMMENT '图片地址',
     `created_at`       timestamp    NULL     DEFAULT NULL,
     `updated_at`       timestamp    NULL     DEFAULT NULL,
     KEY `kylin_refund_pic_refund_pic_id_index` (`refund_pic_id`),

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinOrderTicketsServiceImpl.java

@@ -1279,7 +1279,9 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             }
 
             BigDecimal refundSinglePrice = dataUtils.getCanRefundOrderEntitiesPrice(orderTicketVo, kylinOrderRefundsVoBaseList, orderTicketEntitiesId);
-
+            if(refundSinglePrice.doubleValue()<=0){
+                return ResponseDto.failure("申请金额不得小于0");
+            }
             Map token = CurrentUtil.getTokenClaims();
             String username = StringUtils.defaultString(((String) token.get("nickname")), "");
             boolean result = refundsStatusService.userOrderTicketRefunding(orderTicketVo, refundSinglePrice.doubleValue(), orderTicketEntitiesId, reason, picList, uid, username, kylinOrderRefundsVoBaseList.size());
@@ -1428,7 +1430,7 @@ public class KylinOrderTicketsServiceImpl extends ServiceImpl<KylinOrderTicketsM
             sqls.add(SqlMapping.get("kylin_order_refund.withDraw"));
 
             //TODO 生成新QUERY
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_WITHDRAW, MQConst.ROUTING_KEY_SQL_ORDER_WITHDRAW,
                     SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC));
             return true;
         } catch (Exception e) {

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -403,6 +403,7 @@ public class KylinRefundsStatusServiceImpl {
             mongoTemplate.insert(orderRefundsVo, KylinOrderRefundsVoBase.class.getSimpleName());
 
 
+
             // 退款入场人表
             KylinOrderRefundEntities kylinOrderRefundEntities = new KylinOrderRefundEntities();
             String orderRefundsEntitiesId = IDGenerator.nextSnowId();
@@ -413,29 +414,30 @@ public class KylinRefundsStatusServiceImpl {
             kylinOrderRefundEntities.setCreatedAt(time);
 
             KylinOrderRefundEntitiesVo orderRefundEntitiesVo = new KylinOrderRefundEntitiesVo();
-            BeanUtils.copyProperties(orderRefundEntitiesVo,kylinOrderRefundEntities);
+            BeanUtils.copyProperties(kylinOrderRefundEntities,orderRefundEntitiesVo);
             orderRefundEntitiesVo.setCreatedAt(strTime);
             mongoTemplate.insert(orderRefundEntitiesVo,KylinOrderRefundEntitiesVo.class.getSimpleName());
 
             //退款图片
             KylinOrderRefundPic orderRefundPic = new KylinOrderRefundPic();
-            orderRefundPic.setOrderRefundsId(IDGenerator.nextSnowId());
+            orderRefundPic.setRefundPicId(IDGenerator.nextSnowId());
             orderRefundPic.setOrderRefundsId(kylinOrderRefunds.getOrderRefundsId());
             orderRefundPic.setPicUrl(picList);
             orderRefundPic.setCreatedAt(time);
 
             KylinOrderRefundPicVo orderRefundPicVo = new KylinOrderRefundPicVo();
-            BeanUtils.copyProperties(orderRefundPicVo,orderRefundPic);
+            BeanUtils.copyProperties(orderRefundPic,orderRefundPicVo);
             orderRefundPicVo.setCreatedAt(strTime);
             mongoTemplate.insert(orderRefundPicVo,KylinOrderRefundPicVo.class.getSimpleName());
 
+            dataUtils.delOrderRefundVoByOrderId(orderInfo.getOrderTicketsId());
             //MQ
             LinkedList<String> sqls = new LinkedList<>();
             LinkedList<Object[]> sqlsDataA = new LinkedList<>();
             LinkedList<Object[]> sqlsDataB = new LinkedList<>();
             LinkedList<Object[]> sqlsDataC = new LinkedList<>();
             LinkedList<Object[]> sqlsDataD = new LinkedList<>();
-            LinkedList<Object[]> sqlsDataE = new LinkedList<>();
+            LinkedList  <Object[]> sqlsDataE = new LinkedList<>();
 
             sqls.add(SqlMapping.get("kylin_order_ticket_status.refund"));
             sqls.add(SqlMapping.get("kylin_order_ticket_entities.refund"));
@@ -465,7 +467,7 @@ public class KylinRefundsStatusServiceImpl {
             });
 
             //TODO 生成新QUERY
-            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_PAY, MQConst.ROUTING_KEY_SQL_ORDER_PAY,
+            rabbitTemplate.convertAndSend(MQConst.EXCHANGES_LIQUIDNET_SQL_ORDER_REFUND, MQConst.ROUTING_KEY_SQL_ORDER_REFUND,
                     SqlMapping.gets(sqls, sqlsDataA, sqlsDataB, sqlsDataC, sqlsDataD, sqlsDataE));
 
             return true;

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

@@ -619,6 +619,14 @@ public class DataUtils {
         return (List<KylinOrderRefundsVoBase>) redisUtil.get(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId);
     }
 
+    public void delOrderRefundVo(String orderRefundsId){
+        redisUtil.del(KylinRedisConst.ORDER_REFUND + orderRefundsId);
+    }
+
+    public void delOrderRefundVoByOrderId(String orderId){
+        redisUtil.del(KylinRedisConst.ORDER_REFUND_BY_ORDER_ID + orderId);
+    }
+
     /**
      * 获取可退款票单价格
      * @param orderTicketVo         订单vo数据