Merge branch 'test'

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsOrderService.java

+package com.liquidnet.service.kylin.service;
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.service.base.ResponseDto;
+import com.liquidnet.service.kylin.dto.param.PayAgainParam;
+import com.liquidnet.service.kylin.dto.param.PayOrderParam;
+import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
+import com.liquidnet.service.kylin.dto.vo.returns.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 订单 服务类
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2021-05-20
+ */
+public interface IKylinOrderTicketsOrderService {
+
+    // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
+    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
+
+    // 再次支付(待支付->可支付->倒计时结束释放库存)
+    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
+
+    // 支付回调(待支付->已支付->中断倒计时)
+    String syncOrder(SyncOrderParam syncOrderParam);
+
+    //去 PHP pay检查 订单状态
+    ResponseDto<Integer> checkOrderResult(String orderId);
+
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/service/IKylinOrderTicketsService.java

@@ -22,26 +22,12 @@ import java.util.List;
  */
 public interface IKylinOrderTicketsService  {
 
-    // 下单前判断接口(判断是否可锁定库存)(无订单->待支付->可支付)
-    ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam);
-
-    // 再次支付(待支付->可支付->倒计时结束释放库存)
-    ResponseDto<PayResultVo> payAgain(PayAgainParam payAgainParam);
-
-    // 支付回调(待支付->已支付->中断倒计时)
-    String syncOrder(SyncOrderParam syncOrderParam);
-
-    // 同步大麦数据接口
-
     //订单列表(状态 待支付 已支付 倒计时 已失效)
     PageInfo<List<KylinOrderListVo>> orderList();
 
     //订单详情
     OrderDetailsVo orderDetails(String orderId);
 
-    //去 PHP pay检查 订单状态
-    ResponseDto<Integer> checkOrderResult(String orderId);
-
     //订单未支付数量
     ResponseDto<Integer> orderUnPayCount();
 
@@ -63,15 +49,4 @@ public interface IKylinOrderTicketsService  {
 
     //退款撤回
     ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId);
-
-    //退款再次申请
-    Boolean orderRefundAgain(String orderRefundsId);
-
-
-    // 下单接口(无订单->待支付->可支付)
-    // 删除订单
-    // 代理票务 可买状态判断
-    // 取消支付(待支付->订单失效->释放库存->中断倒计时)
-    // ResponseDto<PayResultVo> order(PayOrderParam payOrderParam, String uid, boolean isMember, int isTrueName, KylinPerformanceVo performanceData, KylinTicketVo ticketData,Object adamEntersList);
-
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/pom.xml

@@ -96,6 +96,21 @@
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-client-admin-generator</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-test</artifactId>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/banners.html

@@ -25,7 +25,7 @@
                             <label>是否上线：</label>
                             <select name="isOnline">
                                 <option value="">全部</option>
-                                <option value="0">下线</option>
+                                <option value="88">下线</option>
                                 <option value="1">上线</option>
                             </select>
                         </li>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/test/java/com.liquidnet.client.admin/TestLocal.java

+package com.liquidnet.client.admin;
+
+import com.liquidnet.service.kylin.constant.KylinTableStatusConst;
+import com.liquidnet.service.kylin.dto.vo.returns.KylinOrderRefundsVo;
+import com.liquidnet.service.kylin.entity.KylinOrderRefunds;
+import com.mongodb.BasicDBObject;
+import com.mongodb.client.result.UpdateResult;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.data.mongodb.core.convert.MongoConverter;
+import org.springframework.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.time.LocalDateTime;
+
+/**
+ * Test
+ */
+@RunWith(SpringJUnit4ClassRunner.class)
+@SpringBootTest
+public class TestLocal {
+    @Autowired
+    private MongoTemplate mongoTemplate;
+
+    @Autowired
+    MongoConverter mongoConverter;
+
+    @Test
+    public void updateAt(){
+        KylinOrderRefunds kylinOrderRefunds = new KylinOrderRefunds();
+        kylinOrderRefunds.setStatus(KylinTableStatusConst.ORDER_REFUND_STATUS_APPLY);
+        kylinOrderRefunds.setApplicantId("1111");
+        kylinOrderRefunds.setApplicantName("2222");
+        kylinOrderRefunds.setApplicantAt(LocalDateTime.now());
+        KylinOrderRefundsVo kylinOrderRefundsVo = new KylinOrderRefundsVo();
+        BeanUtils.copyProperties(kylinOrderRefunds, kylinOrderRefundsVo);
+        kylinOrderRefundsVo.setUpdatedAt(LocalDateTime.now());
+        BasicDBObject EntitiesVov = new BasicDBObject("$set", mongoConverter.convertToMongoType(kylinOrderRefundsVo));
+
+        UpdateResult updateResult = mongoTemplate.getCollection(KylinOrderRefundsVo.class.getSimpleName()).updateOne(
+                Query.query(Criteria.where("orderRefundsId").in("2767295925071872949890")).getQueryObject(),
+                EntitiesVov
+        );
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -38,6 +38,7 @@ import org.springframework.util.StringUtils;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -244,15 +245,6 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
         return pageInfoTmp;
     }
 
-    public Long bannerListCount(BannersSearchParam bannersSearchParam) {
-        try {
-            Long count = bannersMapper.searchBannersCount(BeanUtil.convertBeanToMap(bannersSearchParam));
-            return count;
-        } catch (Exception e) {
-            return 0L;
-        }
-    }
-
     public Boolean delete(List<String> bannersId) {
         try {
             LocalDateTime updatedAt = LocalDateTime.now();

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/mapper/KylinBannersMapper.java

@@ -4,6 +4,7 @@ import com.liquidnet.service.kylin.dao.BannerDetailsDao;
 import com.liquidnet.service.kylin.dao.BannerDetailsListDao;
 import com.liquidnet.service.kylin.entity.KylinBanners;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 import java.util.Map;
@@ -21,6 +22,4 @@ public interface KylinBannersMapper extends BaseMapper<KylinBanners> {
     BannerDetailsDao detail(String bannersId);
     //列表
     List<BannerDetailsListDao> searchBannersList(Map<String,Object> map);
-    //分页数量
-    long searchBannersCount(Map<String,Object> map);
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinBannersMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.liquidnet.service.kylin.mapper.KylinBannersMapper">
-    <select id="detail" parameterType="java.lang.String">
+    <select id="detail" parameterType="java.lang.String" resultType="com.liquidnet.service.kylin.dao.BannerDetailsDao">
         SELECT
         *
         FROM kylin_banners
@@ -22,9 +22,12 @@
             <if test="targetType != ''">
                 AND target_type=${targetType}
             </if>
-            <if test="isOnline != ''">
+            <if test="isOnline != '' and isOnline != 88 ">
                 AND is_online=${isOnline}
             </if>
+            <if test="isOnline == 88 ">
+                AND is_online=0
+            </if>
             <if test="promotionType != ''">
                 AND promotion_type=${promotionType}
             </if>
@@ -32,25 +35,4 @@
         ORDER BY banners_sort DESC
     </select>
 
-    <!-- admin banner列表数量 -->
-    <select id="searchBannersCount" parameterType="java.util.Map" resultType="long">
-        SELECT COUNT(0)
-        FROM kylin_banners
-        <where>
-            is_deleted = 1
-            <if test="bannersName != ''">
-                AND banners_name LIKE concat('%', #{bannersName}, '%')
-            </if>
-            <if test="targetType != ''">
-                AND target_type=#{targetType}
-            </if>
-            <if test="isOnline != ''">
-                AND is_online=#{isOnline}
-            </if>
-            <if test="promotionType != ''">
-                AND promotion_type=#{promotionType}
-            </if>
-        </where>
-    </select>
-
 </mapper>

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/pom.xml

@@ -33,14 +33,6 @@
             <artifactId>spring-boot-starter-data-mongodb</artifactId>
         </dependency>
         <!-- other -->
-        <dependency>
-            <groupId>taobao-sdk-impl</groupId>
-            <artifactId>taobao-sdk-impl</artifactId>
-            <version>0.0.2</version>
-            <type>jar</type>
-            <scope>system</scope>
-            <systemPath>${basedir}/lib/taobao-sdk-java-auto_1600401599540-20210607-impl.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>com.liquidnet</groupId>
             <artifactId>liquidnet-service-kylin-api</artifactId>

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

-package com.liquidnet.service.kylin.utils;
-
-import com.taobao.api.DefaultTaobaoClient;
-import com.taobao.api.TaobaoClient;
-import org.springframework.stereotype.Service;
-
-@Service
-public class TaobaoTicketUtils {
-
-    private String URL = "http://gw.api.taobao.com/router/rest";
-    private String APPKEY = "27542597";
-    private String SECRET = "900025efc616fd2446344bb8fa21d039";
-    private String SUPPLIER_SECRET= "444d0752439f921a75eaf5951a8bc03c";
-    private Long SYSTEM_ID= 15669L;
-//    private String url = "http://gw.api.tbsandbox.com/router/rest";
-//    private String appkey = "4272";
-//    private String secret = "0ebbcccfee18d7ad1aebc5b135ffa906";
-    private TaobaoClient client = null;
-
-    public TaobaoClient initTaobaoClient() {
-        if (client == null) {
-            client = new DefaultTaobaoClient(URL, APPKEY, SECRET);
-        }
-        return client;
-    }
-
-    public String getSupplierSecret(){
-        return SUPPLIER_SECRET;
-    }
-
-    public Long getSystemId(){
-        return SYSTEM_ID;
-    }
-}

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/KylinOrderTicketsController.java

 package com.liquidnet.service.order.controller;
 
 
-import com.github.pagehelper.PageInfo;
 import com.liquidnet.service.base.ErrorMapping;
 import com.liquidnet.service.base.ResponseDto;
 import com.liquidnet.service.kylin.dto.param.PayAgainParam;
 import com.liquidnet.service.kylin.dto.param.PayOrderParam;
 import com.liquidnet.service.kylin.dto.param.SyncOrderParam;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
-import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiResponse;
@@ -19,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * <p>
@@ -36,20 +34,20 @@ import java.util.List;
 public class KylinOrderTicketsController {
 
     @Autowired
-    IKylinOrderTicketsService orderTicketsService;
+    IKylinOrderTicketsOrderService orderTicketsOrderService;
 
     @PostMapping("pre")
     @ApiOperation("下单")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<PayResultVo> checkCanOrder(@RequestBody @Valid PayOrderParam payOrderParam) {
-        return orderTicketsService.checkCanOrder(payOrderParam);
+        return orderTicketsOrderService.checkCanOrder(payOrderParam);
     }
 
     @PostMapping("payAgain")
     @ApiOperation("再次支付")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<PayResultVo> payAgain(@RequestBody @Valid PayAgainParam payAgainParam) {
-        PayResultVo vo = orderTicketsService.payAgain(payAgainParam).getData();
+        PayResultVo vo = orderTicketsOrderService.payAgain(payAgainParam).getData();
         if (null == vo) {
             return ResponseDto.failure(ErrorMapping.get("20024"));
         } else {
@@ -61,14 +59,14 @@ public class KylinOrderTicketsController {
     @ApiOperation("支付回调")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public String syncOrder(@ModelAttribute @Valid SyncOrderParam syncOrderParam) {
-        return orderTicketsService.syncOrder(syncOrderParam);
+        return orderTicketsOrderService.syncOrder(syncOrderParam);
     }
 
     @GetMapping("checkPayment")
     @ApiOperation("订单状态")
     @ApiResponse(code = 200, message = "接口返回对象参数")
     public ResponseDto<HashMap> checkOrderResult(@RequestParam("orderId") @NotNull(message = "订单id不能为空") String orderId) {
-        Integer status = orderTicketsService.checkOrderResult(orderId).getData();
+        Integer status = orderTicketsOrderService.checkOrderResult(orderId).getData();
         if (null == status) {
             return ResponseDto.failure(ErrorMapping.get("20003"));
         } else {

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

@@ -27,6 +27,7 @@ import com.liquidnet.service.kylin.dto.vo.mongo.KylinOrderTicketVo;
 import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
 import com.liquidnet.service.kylin.dto.vo.returns.*;
 import com.liquidnet.service.kylin.entity.*;
+import com.liquidnet.service.kylin.service.IKylinOrderTicketsOrderService;
 import com.liquidnet.service.kylin.service.IKylinOrderTicketsService;
 import com.liquidnet.service.order.utils.*;
 import com.mongodb.BasicDBObject;
@@ -63,7 +64,7 @@ import java.util.*;
  */
 @Service
 @Slf4j
-public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
+public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsOrderService {
 
     @Value("${liquidnet.url-pay.pay}")
     private String payUrl;
@@ -95,7 +96,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
     @Autowired
     private OrderRefundOvertimeServiceImpl orderRefundsCallbackService;
 
-
     ArrayList<Integer> canBuyStatus = new ArrayList() {{
         add(6);
         add(8);
@@ -103,7 +103,6 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
         add(10);
     }};
 
-
     @Override
     public ResponseDto<PayResultVo> checkCanOrder(PayOrderParam payOrderParam) {
         Long currentTime;
@@ -951,44 +950,4 @@ public class KylinOrderTicketsServiceImpl implements IKylinOrderTicketsService {
             return false;
         }
     }
-
-    @Override
-    public PageInfo<List<KylinOrderListVo>> orderList() {
-        return null;
-    }
-
-    @Override
-    public OrderDetailsVo orderDetails(String orderId) {
-        return null;
-    }
-
-    @Override
-    public ResponseDto<Integer> orderUnPayCount() {
-        return null;
-    }
-
-    @Override
-    public KylinOrderTicketPreVo toOrderRefundDetails(String orderId) {
-        return null;
-    }
-
-    @Override
-    public OrderRefundVo orderRefundDetails(String orderId, String orderRefundId) {
-        return null;
-    }
-
-    @Override
-    public String sendOrderRefund(String orderId, String orderTicketEntitiesId, String reason, String picList) {
-        return null;
-    }
-
-    @Override
-    public ResponseDto<Boolean> orderRefundWithdraw(String orderRefundsId) {
-        return null;
-    }
-
-    @Override
-    public Boolean orderRefundAgain(String orderRefundsId) {
-        return null;
-    }
 }