123

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/ReceiveVo.java

+package com.xxfc.platform.vehicle.pojo.vo;
+
+
+import com.xxfc.platform.vehicle.entity.BranchCompany;
+import com.xxfc.platform.vehicle.entity.VehiclePublishReceive;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+@Data
+public class ReceiveVo extends VehiclePublishReceive {
+
+
+
+    @ApiModelProperty("总数")
+    Long number;
+
+
+    @ApiModelProperty("待确认数量")
+    Long waitNumber;
+
+
+    @ApiModelProperty("确认数量")
+    Long confirmNumber;
+
+
+    @ApiModelProperty("拒绝数量")
+    Long refusedNumber;
+
+    @ApiModelProperty("按钮状态：1-待确认；2-已确认；3-已完成;4-已取消")
+    private  Integer buttonState;
+
+
+    @ApiModelProperty("发布公司")
+    BranchCompany publishCompany;
+
+
+    @ApiModelProperty("需求id")
+    private  Integer publishId;
+
+    @ApiModelProperty("类型：1-我要车；2-我有车")
+    private  Integer type;
+
+
+    @ApiModelProperty("开始时间")
+    private  Long startTime;
+
+
+    @ApiModelProperty("结束时间")
+    private  Long endTime;
+
+
+    @ApiModelProperty("状态str")
+    private  String statusStr;
+
+    @ApiModelProperty("接单ids")
+    private String ids;
+
+    private List<VehiclePublishGoodsVo>  publishGoodsVos;
+
+    private  List<VehiclePublishReceiveVo> publishReceiveVos;
+
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehiclePublishReceiveBiz.java

@@ -3,10 +3,13 @@ package com.xxfc.platform.vehicle.biz;
 
 
 import cn.hutool.json.JSONUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.feign.OrderFeign;
 import com.xxfc.platform.order.pojo.order.PulishReceiveBO;
@@ -17,8 +20,10 @@ import com.xxfc.platform.vehicle.mapper.VehiclePublishReceiveMapper;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePublishFindDTO;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePublishReceiveDTO;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleReceiveRefundDTO;
+import com.xxfc.platform.vehicle.pojo.vo.ReceiveVo;
 import com.xxfc.platform.vehicle.pojo.vo.VehicleExtensionVO;
 import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishReceiveVo;
+import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -68,6 +73,9 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
     @Autowired
     VehicleCategoryBiz categoryBiz;
 
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
 
 
     @Transactional(rollbackFor = Exception.class)
@@ -392,5 +400,79 @@ public class VehiclePublishReceiveBiz extends BaseBiz<VehiclePublishReceiveMappe
 
 
 
+    public  List<ReceiveVo> getListByReceive(VehiclePublishFindDTO publishFindDTO){
+        return  mapper.selectListByReceive(publishFindDTO);
+    }
+
+
+    public PageDataVO<ReceiveVo> selectList(VehiclePublishFindDTO publishFindDTO) {
+        Integer page = publishFindDTO.getPage() == null ? 1 : publishFindDTO.getPage();
+        Integer limit = publishFindDTO.getLimit() == null ? 10 : publishFindDTO.getLimit();
+        PageHelper.startPage(page, limit);
+        PageInfo<ReceiveVo> pageInfo = new PageInfo<>(getListByReceive(publishFindDTO));
+        PageDataVO<ReceiveVo> pageDataVO = PageDataVO.pageInfo(pageInfo);
+        List<ReceiveVo> list = pageDataVO.getData();
+        if (CollectionUtils.isNotEmpty(list)) {
+            for (ReceiveVo receiveVo : list) {
+                String statusStr = receiveVo.getStatusStr();
+                if (StringUtils.isNotBlank(statusStr)) {
+                    List<Integer> statusIds = Arrays.asList(statusStr.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+                    Long waitNumber = statusIds.stream().filter(x -> x == 1).count();
+                    waitNumber = waitNumber == null ? 0L : waitNumber;
+                    Long refusedNumber = statusIds.stream().filter(x -> x == 2).count();
+                    refusedNumber = refusedNumber == null ? 0L : refusedNumber;
+                    Long confirmNumber = statusIds.stream().filter(x -> x == 3).count();
+                    confirmNumber = confirmNumber == null ? 0L : confirmNumber;
+                    receiveVo.setWaitNumber(waitNumber);
+                    receiveVo.setRefusedNumber(refusedNumber);
+                    receiveVo.setConfirmNumber(confirmNumber);
+                    Integer buttonState;
+                    if (waitNumber > 0L) {
+                        if (confirmNumber > 0L) {
+                            buttonState = 2;
+                        } else {
+                            buttonState = 1;
+                        }
+                    } else {
+                        if (confirmNumber > 0L){
+                            buttonState = 3;
+                            receiveVo.setPublishCompany(branchCompanyBiz.selectById(receiveVo.getPublishCompanyId()));
+                        }else {
+                            buttonState = 4;
+                        }
+
+                    }
+                    receiveVo.setButtonState(buttonState);
+                    receiveVo.setPublishGoodsVos(mapper.getListByNumber(receiveVo.getReceiveOrderNo()));
+                }
+
+            }
+        }
+        return pageDataVO;
+    }
+
+
+    public ReceiveVo getInfo(String orderNo){
+        VehiclePublishFindDTO publishFindDTO = new VehiclePublishFindDTO();
+        publishFindDTO.setOrderNo(publishFindDTO.getOrderNo());
+        List<ReceiveVo> list = getListByReceive(publishFindDTO);
+        if (CollectionUtils.isNotEmpty(list)){
+            ReceiveVo receiveVo = list.get(0);
+            String ids = receiveVo.getIds();
+            if (StringUtils.isNotBlank(ids)){
+                List<Integer> idList = Arrays.asList(ids.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+                VehiclePublishReceiveDTO receiveDTO = new VehiclePublishReceiveDTO();
+                receiveDTO.setIds(idList);
+                receiveVo.setPublishReceiveVos(getListByIds(receiveDTO));
+            }
+            return  receiveVo;
+        }
+
+        return  null;
+
+    }
+
+
+
 
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehiclePublishReceiveMapper.java

@@ -4,6 +4,8 @@ package com.xxfc.platform.vehicle.mapper;
 import com.xxfc.platform.vehicle.entity.VehiclePublishReceive;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePublishFindDTO;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePublishReceiveDTO;
+import com.xxfc.platform.vehicle.pojo.vo.ReceiveVo;
+import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishGoodsVo;
 import com.xxfc.platform.vehicle.pojo.vo.VehiclePublishReceiveVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.additional.idlist.SelectByIdListMapper;
@@ -22,4 +24,8 @@ public interface VehiclePublishReceiveMapper extends Mapper<VehiclePublishReceiv
 
     List<VehiclePublishReceiveVo> getListByUserId(VehiclePublishFindDTO publishFindDTO);
 
+    List<ReceiveVo> selectListByReceive(VehiclePublishFindDTO publishFindDTO);
+
+    List<VehiclePublishGoodsVo> getListByNumber(@Param("receiveOrderNo") String receiveOrderNo);
+
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehiclePublishReceiveController.java

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.rest;
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehiclePublishReceiveBiz;
+import com.xxfc.platform.vehicle.pojo.dto.VehiclePublishFindDTO;
 import com.xxfc.platform.vehicle.pojo.dto.VehiclePublishReceiveDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModelProperty;
@@ -63,6 +64,26 @@ public class AppVehiclePublishReceiveController extends BaseController<VehiclePu
     }
 
 
+    @GetMapping("selectList")
+    @ApiModelProperty("我的接单")
+    public  ObjectRestResponse selectListByCompany(VehiclePublishFindDTO publishFindDTO) {
+        if (publishFindDTO.getCompanyId() == null || publishFindDTO.getCompanyId() == 0){
+            List<Integer> companyIds = getBusinessUserCompanyIds();
+            if (companyIds != null && companyIds.size() > 0){
+                publishFindDTO.setCompanyId(companyIds.get(0));
+            }
+        }
+        return  ObjectRestResponse.succ(baseBiz.selectList(publishFindDTO));
+    }
+
+
+    @GetMapping("detail")
+    @ApiModelProperty("我的接单详情")
+    public  ObjectRestResponse detail(VehiclePublishFindDTO publishFindDTO) {
+        return  ObjectRestResponse.succ(baseBiz.getInfo(publishFindDTO.getOrderNo()));
+    }
+
+
 
 
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehiclePublishReceiveMapper.xml

@@ -90,4 +90,57 @@
         GROUP BY r.receive_user_id
     </select>
 
+
+
+    <select id="selectListByReceive"  resultType="com.xxfc.platform.vehicle.pojo.vo.ReceiveVo" parameterType="com.xxfc.platform.vehicle.pojo.dto.VehiclePublishReceiveDTO">
+        SELECT
+        r.receive_order_no as receiveOrderNo,
+        COUNT(r.id) as number,
+        r.receive_company_id as receiveCompanyId,
+        r.crt_time as crtTime,
+        p.start_time as startTime,
+        p.end_time as endTime,
+        p.id as publishId,
+        p.type,
+        GROUP_CONCAT(r.`status`) statusStr,
+        GROUP_CONCAT(r.`id`) ids,
+        r.cover,
+        r.publish_company_id as publishCompanyId
+        FROM vehicle_publish_receive r
+        LEFT JOIN vehicle_publish_goods g ON r.publish_goods_id = g.id
+        LEFT JOIN vehicle_publish p ON g.publish_id = p.id
+        <where>
+            r.is_del = 0
+            <if test="companyId != null and companyId > 0">
+                AND  r.receive_company_id= #{companyId}
+            </if>
+            <if test="orderNo != null and orderNo != '' ">
+                AND  r.receive_order_no= #{orderNo}
+            </if>
+        </where>
+        GROUP BY r.receive_order_no
+        ORDER BY r.crt_time DESC
+    </select>
+
+
+    <select id="getListByNumber"  resultType="com.xxfc.platform.vehicle.pojo.vo.VehiclePublishGoodsVo">
+        SELECT
+        COUNT(r.id)as goodsNumber,
+        g.publish_id as publishId,
+        IFNULL(b1.cn_name,b.cn_name) as brandName,
+        IFNULL(c1.`name`,c.`name`) as categoryName
+        FROM vehicle_publish_receive r
+        LEFT JOIN vehicle_publish_goods g ON r.publish_goods_id = g.id
+        LEFT JOIN vehicle v ON g.vehicle_id=v.id
+        LEFT JOIN vehicle_brand b1 ON v.brand_id=b1.id
+        LEFT JOIN vehicle_category c1 ON v.category_id=c1.id
+        LEFT JOIN vehicle_brand b ON g.brand_id=b.id
+        LEFT JOIN vehicle_category c ON g.category_id=c.id
+        <where>
+            r.is_del = 0  and r.receive_order_no=#{receiveOrderNo}
+        </where>
+        GROUP BY r.publish_goods_id
+        ORDER BY goodsNumber DESC
+    </select>
+
 </mapper>
\ No newline at end of file