Merge remote-tracking branch 'origin/master'

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

@@ -20,6 +20,9 @@ public class BagDelivery extends JaapRecord<BagDelivery> {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "赛包业务类型（1：赛包邮寄，2：赛包寄存）", notes = "赛包业务类型（1：赛包邮寄，赛包寄存）")
+    private String applyType;
+
     @ApiModelProperty(value = "赛事ID", notes = "赛事ID")
     private Integer cmptId;
 
@@ -81,7 +84,15 @@ public class BagDelivery extends JaapRecord<BagDelivery> {
     @ExcelField(title = "快递公司名")
     private String expressCompany;
 
-    @ApiModelProperty(value = "状态（1：提交，2：已处理）", notes = "状态（1：提交，2：已处理）")
+    @ApiModelProperty(value = "存包管理员登录码", notes = "存包管理员登录码")
+    @ExcelField(title = "存包管理员登录码")
+    private String loginCode;
+
+    @ApiModelProperty(value = "存包点名称", notes = "存包点名称")
+    @ExcelField(title = "存包点名称")
+    private String storagePoint;
+
+    @ApiModelProperty(value = "状态（0：寄存，1：申请邮寄，2：已邮寄，3：已归还）", notes = "状态（0：寄存，1：申请邮寄，2：已邮寄，3：已归还）")
     private Integer status;
 
     @ApiModelProperty(value = "备注", notes = "备注")
@@ -94,8 +105,10 @@ public class BagDelivery extends JaapRecord<BagDelivery> {
             return "";
         }
         switch (status) {
-            case 1: return "提交";
-            case 2: return "已处理";
+            case 0: return "寄存";
+            case 1: return "申请邮寄";
+            case 2: return "已邮寄";
+            case 3: return "已归还";
             default: return "未知";
         }
     }

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

+package com.dlbridge.jadp.plugins.partner.bean;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class BagDropPoints {
+    private Integer id;
+    private Integer cmptId;
+    private String pointName;
+}

src/main/java/com/dlbridge/jadp/plugins/partner/controller/BagDeliveryController.java

@@ -5,6 +5,7 @@ import com.dlbridge.jadp.plugins.cmpt.dao.model.Cmpt;
 import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
 import com.dlbridge.jadp.plugins.cmpt.utils.Page;
 import com.dlbridge.jadp.plugins.partner.bean.BagDelivery;
+import com.dlbridge.jadp.plugins.partner.bean.BagDropPoints;
 import com.dlbridge.jadp.plugins.partner.bean.BagParam;
 import com.dlbridge.jadp.plugins.partner.service.BagDeliveryService;
 import com.neusoft.www.utils.web.Result;
@@ -69,6 +70,17 @@ public class BagDeliveryController {
         return bagDeliveryService.updateBagDelivery(bagDelivery);
     }
 
+    /**
+     * 赛包归还
+     * @param bagDelivery
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/bag-return", method = RequestMethod.POST)
+    public Result bagReturn(@RequestBody BagDelivery bagDelivery) {
+        return bagDeliveryService.bagReturn(bagDelivery);
+    }
+
     @ResponseBody
     @RequestMapping(value = "/delete", method = RequestMethod.GET)
     public Result delBagDelivery(@RequestParam("id") Integer id) {
@@ -83,4 +95,27 @@ public class BagDeliveryController {
         bagDeliveryService.export(param, response);
     }
 
+    /**
+     * 查询存包点列表
+     * @param cmptId
+     * @return
+     */
+    @RequestMapping("storage-points/{cmptId}")
+    @ResponseBody
+    public List<BagDropPoints> queryBagDropPoints(@PathVariable("cmptId") Integer cmptId) {
+        return bagDeliveryService.queryBagDropPoints(cmptId);
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/delete-points", method = RequestMethod.GET)
+    public Result delBagDropPoints(@RequestParam("cmptId") Integer cmptId) {
+        return bagDeliveryService.delBagDropPoints(cmptId);
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/save_points", method = RequestMethod.POST)
+    public Result saveBagDropPoints(@RequestBody List<BagDropPoints> bagDropPoints) {
+        return bagDeliveryService.saveBagDropPoints(bagDropPoints);
+    }
+
 }

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

 package com.dlbridge.jadp.plugins.partner.mapper;
 
 import com.dlbridge.jadp.plugins.partner.bean.BagDelivery;
+import com.dlbridge.jadp.plugins.partner.bean.BagDropPoints;
 import com.dlbridge.jadp.plugins.partner.bean.BagParam;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
@@ -18,4 +19,12 @@ public interface BagDeliveryMapper {
 
     List<BagDelivery> queryBagDeliveryByPage(@Param("page") Pageable page, @Param("param") BagParam param);
     List<BagDelivery> queryBagDelivery(@Param("param") BagParam param);
+
+    List<BagDropPoints> queryBagDropPoints(@Param("cmptId") Integer cmptId);
+
+    int enrollCheck(@Param("cmptId") Integer cmptId, @Param("markNo") String markNo);
+
+    int insertBagDropPoints(@Param("list") List<BagDropPoints> list);
+
+    int delBagDropPoints(@Param("cmptId") Integer cmptId);
 }

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

@@ -3,8 +3,10 @@
 <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,express_company,remark,status,del_flag,create_date)
-        values( #{bag.cmptId},#{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},1,0,now())
+        insert  into bag_delivery(cmpt_id ,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},
+               #{bag.area},#{bag.areaCode},#{bag.location},#{bag.deliveryNo},#{bag.expressCompany},#{bag.remark},#{bag.loginCode},#{bag.storagePoint},#{bag.status},0,now())
     </insert>
 
     <update id="delBagDelivery">
@@ -15,48 +17,54 @@
         update bag_delivery
         set
         update_date = now()
-        <if test="name != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(name)">
             ,name=#{name}
         </if>
-        <if test="markNo != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(markNo)">
             ,mark_no=#{markNo}
         </if>
-        <if test="phone != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(phone)">
             ,phone=#{phone}
         </if>
-        <if test="province != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(province)">
             ,province=#{province}
         </if>
-        <if test="provinceCode != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(provinceCode)">
             ,province_code=#{provinceCode}
         </if>
-        <if test="city != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(city)">
             ,city=#{city}
         </if>
-        <if test="cityCode != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(cityCode)">
             ,city_code=#{cityCode}
         </if>
-        <if test="area != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(area)">
             ,area=#{area}
         </if>
-        <if test="areaCode != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(areaCode)">
             ,area_code=#{areaCode}
         </if>
-        <if test="location != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(location)">
             ,location=#{location}
         </if>
-        <if test="deliveryNo != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(deliveryNo)">
             ,delivery_no=#{deliveryNo}
         </if>
-        <if test="expressCompany != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(expressCompany)">
             ,express_company=#{expressCompany}
         </if>
-        <if test="remark != null">
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(remark)">
             ,remark=#{remark}
         </if>
         <if test="status != null">
             ,status=#{status}
         </if>
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(loginCode)">
+            ,login_code=#{loginCode}
+        </if>
+        <if test="@org.apache.commons.lang3.StringUtils@isNotBlank(storagePoint)">
+            ,storage_point=#{storagePoint}
+        </if>
         where id=#{id}
     </update>
 
@@ -80,6 +88,8 @@
         a.delivery_no deliveryNo,
         a.express_company expressCompany,
         a.remark,
+        a.login_code loginCode,
+        a.storage_point 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
@@ -117,6 +127,8 @@
             a.delivery_no deliveryNo,
             a.express_company expressCompany,
             a.remark,
+            a.login_code loginCode,
+            a.storage_point 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
@@ -139,4 +151,28 @@
         </if>
     </sql>
 
+    <select id="enrollCheck" resultType="Integer">
+        select count(1)
+        from geerunner.cmpt_enroll as a
+        where a.cmpt_id = #{cmptId}
+        and a.nick_id = #{markNo}
+        and a.del_flg = 0
+    </select>
+
+    <insert id="insertBagDropPoints">
+        insert  into bag_drop_points(cmpt_id ,point_name,create_date)
+        VALUES
+        <foreach collection="list" item="item" index="index" separator=",">
+            (#{item.cmptId},#{item.pointName},now())
+        </foreach>
+    </insert>
+
+    <update id="delBagDropPoints">
+        update bag_drop_points set del_flag = 1 where cmpt_id = #{cmptId}
+    </update>
+
+    <select id="queryBagDropPoints" resultType="com.dlbridge.jadp.plugins.partner.bean.BagDropPoints">
+        select id, point_name pointName from bag_drop_points a where a.del_flag=0 and cmpt_id = #{cmptId}
+    </select>
+
 </mapper>
\ No newline at end of file

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

@@ -7,6 +7,7 @@ import com.dlbridge.jadp.plugins.cmpt.service.CmptService;
 import com.dlbridge.jadp.plugins.cmpt.utils.Page;
 import com.dlbridge.jadp.plugins.cmpt.utils.PageFactory;
 import com.dlbridge.jadp.plugins.partner.bean.BagDelivery;
+import com.dlbridge.jadp.plugins.partner.bean.BagDropPoints;
 import com.dlbridge.jadp.plugins.partner.bean.BagParam;
 import com.dlbridge.jadp.plugins.partner.mapper.BagDeliveryMapper;
 import com.neusoft.www.utils.web.Result;
@@ -52,19 +53,88 @@ public class BagDeliveryService {
      * @return
      */
     public Result applyBagDelivery(BagDelivery bagDelivery) {
+        if(StringUtils.isBlank(bagDelivery.getApplyType())){
+            bagDelivery.setApplyType("1");
+        }
+        if("1".equals(bagDelivery.getApplyType())){
+            Result checkResult = checkBagDelivery(bagDelivery);
+            if(!checkResult.status){
+                return checkResult;
+            }
+        }else {
+            Result checkResult = checkBagStorage(bagDelivery);
+            if(!checkResult.status){
+                return checkResult;
+            }
+        }
+        int enrollCount = bagDeliveryMapper.enrollCheck(bagDelivery.getCmptId(), bagDelivery.getMarkNo());
+        if(enrollCount == 0){
+            return Result.fail().setMsg("未查询到参赛信息");
+        }
+
+        String bagId = "";
+        BagParam param = new BagParam();
+        param.setCmptId(bagDelivery.getCmptId());
+        param.setMarkNo(bagDelivery.getMarkNo());
+        List<BagDelivery> deliveries = bagDeliveryMapper.queryBagDelivery(param);
+
+        if(deliveries != null && !deliveries.isEmpty()){
+            bagId = deliveries.get(0).getId();
+        }
+
+        // 赛包业务类型（1：赛包邮寄，2：赛包寄存）
+        if("1".equals(bagDelivery.getApplyType())){
+            if(StringUtils.isBlank(bagId)){
+                // 申请邮寄状态
+                bagDelivery.setStatus(1);
+                bagDeliveryMapper.insertBagDelivery(bagDelivery);
+            }else {
+                // 申请邮寄状态
+                bagDelivery.setStatus(1);
+                bagDelivery.setId(bagId);
+                bagDeliveryMapper.updateBagDelivery(bagDelivery);
+            }
+        }else {
+            if(StringUtils.isBlank(bagId)){
+                // 申请邮寄状态
+                bagDelivery.setStatus(0);
+                bagDeliveryMapper.insertBagDelivery(bagDelivery);
+            }else {
+                // 申请邮寄状态
+                bagDelivery.setStatus(0);
+                bagDelivery.setId(bagId);
+                bagDeliveryMapper.updateBagDelivery(bagDelivery);
+            }
+        }
+        return Result.success();
+    }
+
+    private Result checkBagDelivery(BagDelivery bagDelivery){
         if(StringUtils.isBlank(bagDelivery.getName())){
-            Result.fail().setMsg("姓名不能为空");
+            return Result.fail().setMsg("姓名不能为空");
         }
         if(StringUtils.isBlank(bagDelivery.getMarkNo())){
-            Result.fail().setMsg("参赛号不能为空");
+            return Result.fail().setMsg("参赛号不能为空");
         }
         if(StringUtils.isBlank(bagDelivery.getPhone())){
-            Result.fail().setMsg("电话不能为空");
+            return Result.fail().setMsg("电话不能为空");
         }
         if(StringUtils.isBlank(bagDelivery.getLocation())){
-            Result.fail().setMsg("地址不能为空");
+            return Result.fail().setMsg("地址不能为空");
+        }
+        return Result.success();
+    }
+
+    private Result checkBagStorage(BagDelivery bagDelivery){
+        if(StringUtils.isBlank(bagDelivery.getMarkNo())){
+            return Result.fail().setMsg("参赛号不能为空");
+        }
+        if(StringUtils.isBlank(bagDelivery.getLoginCode())){
+            return Result.fail().setMsg("登录码不能为空");
+        }
+        if(StringUtils.isBlank(bagDelivery.getStoragePoint())){
+            return Result.fail().setMsg("存包站点不能为空");
         }
-        bagDeliveryMapper.insertBagDelivery(bagDelivery);
         return Result.success();
     }
 
@@ -81,6 +151,37 @@ public class BagDeliveryService {
         return Result.success();
     }
 
+    /**
+     * 赛包归还
+     * @param bagDelivery
+     * @return
+     */
+    public Result bagReturn(BagDelivery bagDelivery) {
+        if(bagDelivery.getCmptId() == null){
+            Result.fail().setMsg("赛事ID不能为空");
+        }
+        if(StringUtils.isBlank(bagDelivery.getMarkNo())){
+            Result.fail().setMsg("参赛号不能为空");
+        }
+        int enrollCount = bagDeliveryMapper.enrollCheck(bagDelivery.getCmptId(), bagDelivery.getMarkNo());
+        if(enrollCount == 0){
+            return Result.fail().setMsg("未查询到参赛信息");
+        }
+
+        BagParam param = new BagParam();
+        param.setCmptId(bagDelivery.getCmptId());
+        param.setMarkNo(bagDelivery.getMarkNo());
+        List<BagDelivery> deliveries = bagDeliveryMapper.queryBagDelivery(param);
+        if(deliveries == null || deliveries.isEmpty()){
+            return Result.fail().setMsg("未查询到寄存信息");
+        }
+        // 归还状态
+        bagDelivery.setId(deliveries.get(0).getId());
+        bagDelivery.setStatus(3);
+        bagDeliveryMapper.updateBagDelivery(bagDelivery);
+        return Result.success();
+    }
+
     /**
      * 赛包申请删除接口
      * @param id
@@ -127,4 +228,18 @@ public class BagDeliveryService {
         }
         return deliveries;
     }
+
+    public List<BagDropPoints> queryBagDropPoints(Integer cmptId){
+        return bagDeliveryMapper.queryBagDropPoints(cmptId);
+    }
+
+    public Result delBagDropPoints(Integer cmptId) {
+        bagDeliveryMapper.delBagDropPoints(cmptId);
+        return Result.success();
+    }
+
+    public Result saveBagDropPoints(List<BagDropPoints> bagDropPoints) {
+        bagDeliveryMapper.insertBagDropPoints(bagDropPoints);
+        return Result.success();
+    }
 }