赛包存取接口1

src/main/java/com/dlbridge/jadp/plugins/partner/bean/BagDelivery.java

@@ -21,7 +21,7 @@ public class BagDelivery extends JaapRecord<BagDelivery> {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty(value = "赛包业务类型（1：赛包邮寄，2：赛包寄存）", notes = "赛包业务类型（1：赛包邮寄，赛包寄存）")
-    private String applyType;
+    private String serviceType;
 
     @ApiModelProperty(value = "赛事ID", notes = "赛事ID")
     private Integer cmptId;

src/main/java/com/dlbridge/jadp/plugins/partner/bean/BagParam.java

@@ -11,11 +11,12 @@ import lombok.Setter;
 public class BagParam {
     @ApiModelProperty(value = "赛事ID", notes = "赛事ID")
     private Integer cmptId;
-
     @ApiModelProperty(value = "状态（1：提交，2：已处理）", notes = "状态（1：提交，2：已处理）")
     private Integer status;
     @ApiModelProperty(value = "关键字", notes = "关键字")
     private String keyword;
     @ApiModelProperty(value = "参赛号", notes = "参赛号")
     private String markNo;
+    @ApiModelProperty(value = "业务类型（1：赛包邮寄，2：赛包寄存）", notes = "业务类型（1：赛包邮寄，2：赛包寄存）")
+    private String serviceType;
 }

src/main/java/com/dlbridge/jadp/plugins/partner/mapper/BagDeliveryMapper.xml

@@ -3,9 +3,9 @@
 <mapper namespace="com.dlbridge.jadp.plugins.partner.mapper.BagDeliveryMapper">
 
     <insert id="insertBagDelivery">
-        insert  into bag_delivery(cmpt_id ,name,mark_no,phone,province,province_code,city,city_code,area,area_code,location,delivery_no,
+        insert  into bag_delivery(cmpt_id,service_type,name,mark_no,phone,province,province_code,city,city_code,area,area_code,location,delivery_no,
                                   express_company,remark,login_code,storage_point,status,del_flag,create_date)
-        values( #{bag.cmptId},#{bag.name},#{bag.markNo},#{bag.phone},#{bag.province},#{bag.provinceCode},#{bag.city},#{bag.cityCode},
+        values( #{bag.cmptId},#{bag.serviceType},#{bag.name},#{bag.markNo},#{bag.phone},#{bag.province},#{bag.provinceCode},#{bag.city},#{bag.cityCode},
                #{bag.area},#{bag.areaCode},#{bag.location},#{bag.deliveryNo},#{bag.expressCompany},#{bag.remark},#{bag.loginCode},#{bag.storagePoint},#{bag.status},0,now())
     </insert>
 
@@ -20,6 +20,9 @@
         <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(name)">
             ,name=#{name}
         </if>
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(serviceType)">
+            ,service_type=#{serviceType}
+        </if>
         <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(markNo)">
             ,mark_no=#{markNo}
         </if>
@@ -72,6 +75,7 @@
         select
         c.item_name roadName,
         a.id,
+        a.service_type serviceType,
         a.cmpt_id cmptId,
         a.create_date createDate,
         a.update_date updateDate,
@@ -89,13 +93,14 @@
         a.express_company expressCompany,
         a.remark,
         a.login_code loginCode,
-        a.storage_point storagePoint,
+        d.point_name storagePoint,
         a.status
         from bag_delivery a
         LEFT JOIN geerunner.cmpt_enroll b ON a.cmpt_id=b.cmpt_id AND a.mark_no=b.nick_id
         LEFT JOIN geerunner.cmpt_item c ON c.cmpt_id=b.cmpt_id AND b.cmpt_item=c.item_id
+        LEFT JOIN gksite.bag_drop_points d on d.cmpt_id = a.cmpt_id and d.id = a.storage_point
         where a.del_flag = 0
-        AND b.del_flg=0 AND c.del_flg=0
+        AND b.del_flg=0 AND c.del_flg=0 and d.del_flag= 0
         <include refid="bag-where-sql"/>
         order by a.create_date desc
         limit #{page.offset},#{page.size}
@@ -111,6 +116,7 @@
         SELECT
             c.item_name roadName,
             a.id,
+            a.service_type serviceType,
             a.cmpt_id cmptId,
             a.create_date createDate,
             a.update_date updateDate,
@@ -128,13 +134,14 @@
             a.express_company expressCompany,
             a.remark,
             a.login_code loginCode,
-            a.storage_point storagePoint,
+            d.point_name storagePoint,
             a.status
         from gksite.bag_delivery a
         LEFT JOIN geerunner.cmpt_enroll b ON a.cmpt_id=b.cmpt_id AND a.mark_no=b.nick_id
         LEFT JOIN geerunner.cmpt_item c ON c.cmpt_id=b.cmpt_id AND b.cmpt_item=c.item_id
+        LEFT JOIN gksite.bag_drop_points d on d.cmpt_id = a.cmpt_id and d.id = a.storage_point
         WHERE a.del_flag = 0
-        AND b.del_flg=0 AND c.del_flg=0
+        AND b.del_flg=0 AND c.del_flg=0 and d.del_flag= 0
         <include refid="bag-where-sql"/>
     </select>
 
@@ -149,6 +156,9 @@
         <if test="param.markNo != null and param.markNo != ''">
             and a.mark_no = #{param.markNo}
         </if>
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(param.serviceType)">
+            and a.service_type=#{param.serviceType}
+        </if>
     </sql>
 
     <select id="enrollCheck" resultType="Integer">

src/main/java/com/dlbridge/jadp/plugins/partner/service/BagDeliveryService.java

@@ -24,6 +24,7 @@ import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 @Service
 @Log4j2
@@ -53,10 +54,10 @@ public class BagDeliveryService {
      * @return
      */
     public Result applyBagDelivery(BagDelivery bagDelivery) {
-        if(StringUtils.isBlank(bagDelivery.getApplyType())){
-            bagDelivery.setApplyType("1");
+        if(StringUtils.isBlank(bagDelivery.getServiceType())){
+            bagDelivery.setServiceType("1");
         }
-        if("1".equals(bagDelivery.getApplyType())){
+        if("1".equals(bagDelivery.getServiceType())){
             Result checkResult = checkBagDelivery(bagDelivery);
             if(!checkResult.status){
                 return checkResult;
@@ -76,6 +77,7 @@ public class BagDeliveryService {
         BagParam param = new BagParam();
         param.setCmptId(bagDelivery.getCmptId());
         param.setMarkNo(bagDelivery.getMarkNo());
+        param.setServiceType(bagDelivery.getServiceType());
         List<BagDelivery> deliveries = bagDeliveryMapper.queryBagDelivery(param);
 
         if(deliveries != null && !deliveries.isEmpty()){
@@ -83,7 +85,7 @@ public class BagDeliveryService {
         }
 
         // 赛包业务类型（1：赛包邮寄，2：赛包寄存）
-        if("1".equals(bagDelivery.getApplyType())){
+        if("1".equals(bagDelivery.getServiceType())){
             if(StringUtils.isBlank(bagId)){
                 // 申请邮寄状态
                 bagDelivery.setStatus(1);
@@ -95,6 +97,7 @@ public class BagDeliveryService {
                 bagDeliveryMapper.updateBagDelivery(bagDelivery);
             }
         }else {
+            bagDelivery.setServiceType("2");
             if(StringUtils.isBlank(bagId)){
                 // 申请邮寄状态
                 bagDelivery.setStatus(0);
@@ -135,6 +138,11 @@ public class BagDeliveryService {
         if(StringUtils.isBlank(bagDelivery.getStoragePoint())){
             return Result.fail().setMsg("存包站点不能为空");
         }
+        List<BagDropPoints> points = bagDeliveryMapper.queryBagDropPoints(bagDelivery.getCmptId());
+        Set<Integer> pointSet = points.stream().map(BagDropPoints::getId).collect(Collectors.toSet());
+        if(pointSet == null || !pointSet.contains(bagDelivery.getStoragePoint())){
+            return Result.fail().setMsg("存包点不存在");
+        }
         return Result.success();
     }