Merge branch 'dev' into test

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

@@ -15,11 +15,16 @@ liquidnet:
     username: testmall
     password: zhengzai!mYT
   rabbitmq:
-    host: rabbitmq.zhengzai.tv
+#    host: rabbitmq.zhengzai.tv
+#    port: 5672
+#    username: admin
+#    password: admin
+#    virtual-host: /
+    host: 101.201.127.58
     port: 5672
     username: admin
     password: admin
-    virtual-host: /
+    virtual-host: liquidnet
   knife4j:
     disable: false
   redis:

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

@@ -15,10 +15,10 @@ liquidnet:
     username: zhengzai
     password: $hAh4SGcDQ
   rabbitmq:
-    host: amqp-cn-7pp26mhtn001.mq-amqp.cn-beijing-327844-a-internal.aliyuncs.com
+    host: 101.201.127.58
     port: 5672
-    username: MjphbXFwLWNuLTdwcDI2bWh0bjAwMTpMVEFJNXRGajR0UWplbW82NjRCcmtxS1o=
-    password: MzlENTBFRDE0NEE4MkM1RUE2MTc1RDhBMTVFNzhDQTNDQTQ3NEY4RDoxNjIyODE1ODU3ODEz
+    username: admin
+    password: admin
     virtual-host: liquidnet
   knife4j:
     disable: false

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/controller/admin/AdamDMAdminController.java

@@ -39,6 +39,8 @@ public class AdamDMAdminController extends AdamBaseController {
     DMMemberOrderProcessor dmMemberOrderProcessor;
     @Autowired
     DMMemberCodeProcessor dmMemberCodeProcessor;
+    @Autowired
+    DMCollectionProcessor dmCollectionProcessor;
 
     @ApiOperationSupport(order = 1)
     @ApiOperation(value = "user")
@@ -111,4 +113,12 @@ public class AdamDMAdminController extends AdamBaseController {
         dmMemberCodeProcessor.handler();
         return ResponseDto.success();
     }
+
+    @ApiOperationSupport(order = 10)
+    @ApiOperation(value = "collect")
+    @GetMapping(value = {"collect"})
+    public ResponseDto<Object> dataMigrationForCollect() {
+        dmCollectionProcessor.handler();
+        return ResponseDto.success();
+    }
 }

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

@@ -29,6 +29,7 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.regex.Pattern;
 import java.util.stream.Collectors;
@@ -86,6 +87,21 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
             }
             if (days > 0) {
                 isRecommend = 0;
+
+                HashMap toDayTime = DateUtil.oneDayStartEnd();
+                String nowTimeTStr = (String) toDayTime.get("startStr");
+
+                String timeStart = info.getTimeStart();
+
+                // 今天的0点到几天后的0点
+                Calendar cal = Calendar.getInstance();
+                cal.setTime((Date) toDayTime.get("start"));
+                Date beforeDayEnd = DateUtil.getBeforeDayBegin(cal, days);
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                String daysLaterStr = sdf.format(beforeDayEnd);
+                if (-1 == DateUtil.compareStrDay(timeStart, nowTimeTStr) || -1 == DateUtil.compareStrDay(daysLaterStr, timeStart)) {
+                    isShow = false;
+                }
             }
             if (isShow) {
                 performancesIds.add(info.getPerformancesId());

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

@@ -286,6 +286,7 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setApplicantId(authId);
         kylinOrderRefunds.setApplicantName(authName);
         kylinOrderRefunds.setApplicantAt(LocalDateTime.now());
+        kylinOrderRefunds.setType(1);
         kylinOrderRefunds.setReason(reason);
         if (RefundPriceExpress > 0 && entitiesPriceSum > 0) {
             kylinOrderRefunds.setRefundCate(KylinTableStatusConst.ORDER_REFUND_CATE3);

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

@@ -8,12 +8,10 @@ import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
 import com.liquidnet.service.kylin.dao.KylinOrderTicketEntitiesDao;
 import com.liquidnet.service.kylin.dto.param.RefundApplyParam;
 import com.liquidnet.service.kylin.dto.param.RefundCallbackParam;
-import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketEntities;
-import com.liquidnet.service.kylin.entity.KylinOrderTicketStatus;
-import com.liquidnet.service.kylin.entity.KylinOrderTickets;
+import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.IKylinOrderRefundsService;
+import com.liquidnet.service.kylin.utils.DataUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.mongodb.core.MongoTemplate;
@@ -51,9 +49,15 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
     @Autowired
     private KylinOrderTicketEntitiesMapper kylinOrderTicketEntitiesMapper;
 
+    @Autowired
+    private KylinOrderTicketRelationsMapper kylinOrderTicketRelationsMapper;
+
     @Autowired
     MongoTemplate mongoTemplate;
 
+    @Autowired
+    private DataUtils dataUtils;
+
     public String refundCallback(RefundCallbackParam refundCallbackParam) {
         KylinOrderRefunds refundInfo = kylinOrderRefundsMapper.selectOne(
                 new UpdateWrapper<KylinOrderRefunds>()
@@ -103,6 +107,9 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
         KylinOrderTickets orderInfo = kylinOrderTicketsMapper.selectOne(
                 new QueryWrapper<KylinOrderTickets>().eq("order_tickets_id", orderTicketsId)
         );
+        KylinOrderTicketRelations orderRelations = kylinOrderTicketRelationsMapper.selectOne(
+                new QueryWrapper<KylinOrderTicketRelations>().eq("order_id", orderTicketsId)
+        );
         // 传的快递费不能大于实际的快递费=（支付的快递费-已退的快递费）
         Double refundPriceExpressSum = kylinOrderRefundsMapper.RefundPriceExpressSum(// 已退快递费
                 orderTicketsId,
@@ -155,6 +162,14 @@ public class OrderRefundsCallbackServiceImpl extends ServiceImpl<KylinOrderRefun
                 ticketEntityIds, entitiesPrice
         );
         if (res) {
+                // 超时直接退还库存
+                for (String entitiesId : ticketEntityIds) {
+                    dataUtils.changeSurplusGeneral(entitiesId, 1);
+                    KylinOrderTicketEntities entitiesInfo = kylinOrderTicketEntitiesMapper.selectOne(
+                            new QueryWrapper<KylinOrderTicketEntities>().eq("order_ticket_entities_id", entitiesId)
+                    );
+                    dataUtils.changeBuyInfo(orderInfo.getUserId(), "", orderRelations.getPerformanceId(), entitiesInfo.getTicketId(), -1);
+                }
             return true;
         } else {
             return false;