调整-11-28

lichao
1 parent fb3969ba
Showing 13 changed files with 117 additions and 10 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderCarMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderCarService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderCarServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderCarMapper.xml
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
@@ -28,10 +28,7 @@ import com.trash.framework.web.service.TokenService;
 import com.trash.garbage.custom.BizException;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.global.ResultCode;
-import com.trash.garbage.pojo.domain.DriverSend;
-import com.trash.garbage.pojo.domain.GarOrder;
-import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
-import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
+import com.trash.garbage.pojo.domain.*;
 import com.trash.garbage.service.*;
 import com.trash.garbage.pojo.dto.*;
 import com.trash.garbage.pojo.vo.GarOrderMatchAskVo;
@@ -76,6 +73,8 @@ public class GarbageOrderController {
     private GarAddressService garAddressService;
     @Autowired
     private GarOrderMatchHandlerService garOrderMatchHandlerService;
+    @Autowired
+    private GarOrderCarService garOrderCarService;
     @PostMapping("/add")
     @Log(title = "创建订单", businessType = BusinessType.INSERT)
@@ -269,7 +268,21 @@ public class GarbageOrderController {
     public Result<?> updateCarCount(@RequestBody Map<String, String> params) {
         String carCount = params.get("carCount");
         String tel = params.get("tel");
-        return Result.OK(garOrderMatchHandlerService.updateCarCount(carCount,tel));
+        String orderNo = params.get("orderNo");
+        return Result.OK(garOrderMatchHandlerService.updateCarCount(carCount,tel,orderNo));
+    }
+
+    @GetMapping("/selectGarOrderCar/{orderNo}")
+    public Result<?> selectGarOrderCar(@PathVariable("orderNo") String orderNo) {
+        return Result.OK(garOrderCarService.selectGarOrderCar(orderNo));
+    }
+
+    @PostMapping("/insertRandomCopyByTypeAndOrderId")
+    public Result<?> insertRandomCopyByTypeAndOrderId(@RequestBody Map<String, String> params) {
+        String orderId = params.get("orderNo");
+        String orderCarType = params.get("orderCarType");
+        String count = params.get("carCount");
+        return Result.OK(garOrderService.updateGarRealCarCounts(orderId,Integer.parseInt(count),orderCarType));
     }
     @GetMapping("/queryByOrderNo/{orderNo}")
@@ -2,6 +2,9 @@ package com.trash.garbage.mapper;
 import com.trash.garbage.pojo.domain.GarOrderCar;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
 * @author 20412
@@ -12,6 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 public interface GarOrderCarMapper extends BaseMapper<GarOrderCar> {
     GarOrderCar selectByGarOrderId(String garOrderId);
     int insertSelective(GarOrderCar garOrderCar);
+    List<GarOrderCar> selectGarOrderCar(String garOrderNo);
+
+    int insertRandomCopyByTypeAndOrderId(@Param("garOrderId")String garOrderId,@Param("garOrderCarType") String garOrderCarType);
 }
@@ -25,7 +25,7 @@ public interface GarOrderMatchHandlerMapper extends BaseMapper&lt;GarOrderMatchHand
     String queryCarCountByTel(@Param("tel") String tel);
-    int updateCarCount(@Param("carCount") String carCount ,@Param("tel") String tel);
+    int updateCarCount(@Param("carCount") String carCount ,@Param("tel") String tel ,@Param("orderNo") String orderNo);
     List<GarOrderMatchHandler> queryByOrderNo(@Param("orderNo") String orderNo);
@@ -78,6 +78,9 @@ public class GarOrderCar implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+    @TableField(exist = false)
+    private String count;
+
     public String getPlateNo() {
@@ -16,4 +16,8 @@ public interface GarOrderCarService extends IService&lt;GarOrderCar&gt; {
     List<GarOrderCar> queryByOrderId(String orderId);
     List<GarOrderMatchHandler> queryGarOrderMatchHandler( String orderId);
+
+    List<GarOrderCar> selectGarOrderCar(String garOrderNo);
+
+    int insertRandomCopyByTypeAndOrderId(String garOrderId,String garOrderCarType);
 }
@@ -19,7 +19,7 @@ public interface GarOrderMatchHandlerService extends IService&lt;GarOrderMatchHandl
     List<GarOrderMatchHandler> queryByOrderId(String orderId);
     String queryOrderNo(String carCode);
     String queryCarCountByTel(String tel);
-    int updateCarCount(String carCount,String tel);
+    int updateCarCount(String carCount,String tel,String orderNo);
     List<GarOrderMatchHandler> queryByOrderNo(String orderNo);
     List<GarOrderMatchHandler> queryByOrderNoDriver(String orderNo,String phone);
 }
@@ -117,4 +117,6 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
     List<GarOrderMatchHandler> getGarOrderMatchHandlers(String garOrderId);
+    int updateGarRealCarCounts(String garOrderId,Integer garRealCarCount,String orderCarType);
+
 }
@@ -24,6 +24,9 @@ public class GarOrderCarServiceImpl extends ServiceImpl&lt;GarOrderCarMapper, GarOr
     @Autowired
     private GarOrderMatchHandlerMapper garOrderMatchHandlerMapper;
+    @Autowired
+    private GarOrderCarMapper garOrderCarMapper;
+
     @Override
     public List<GarOrderCar> queryByOrderId(String orderId) {
         LambdaQueryWrapper<GarOrderCar> wrapper = new LambdaQueryWrapper<>();
@@ -35,6 +38,16 @@ public class GarOrderCarServiceImpl extends ServiceImpl&lt;GarOrderCarMapper, GarOr
     public List<GarOrderMatchHandler> queryGarOrderMatchHandler(String orderId) {
         return garOrderMatchHandlerMapper.queryGarOrderMatchHandler(orderId);
     }
+
+    @Override
+    public List<GarOrderCar> selectGarOrderCar(String garOrderNo) {
+        return garOrderCarMapper.selectGarOrderCar(garOrderNo);
+    }
+
+    @Override
+    public int insertRandomCopyByTypeAndOrderId(String garOrderId, String garOrderCarType) {
+        return garOrderCarMapper.insertRandomCopyByTypeAndOrderId(garOrderId, garOrderCarType);
+    }
 }
@@ -58,6 +58,7 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
         }
         HashMap hash = JSON.parseObject(json, HashMap.class);
+
         if (!StringUtils.equals(String.valueOf(hash.get("code")), "200")) {
             log.warn("json code no equals 200");
             return Collections.emptyList();
@@ -141,6 +142,7 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
         params.put("tag", 1);
         params.put("page", 1);
         params.put("size", 1000);
+        params.put("overdue", 0);
         return com.trash.garbage.utils.HttpUtil.doPost("/api/siteservice/cs/earthsites/ledger/list", JSON.toJSONString(params));
     }
@@ -44,8 +44,8 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
     }
     @Override
-    public int updateCarCount(String carCount , String tel) {
-        return baseMapper.updateCarCount(carCount, tel);
+    public int updateCarCount(String carCount , String tel ,String orderNo) {
+        return baseMapper.updateCarCount(carCount, tel ,orderNo);
     }
     @Override
@@ -1882,6 +1882,33 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         return newCar;
     }
+    public int updateGarRealCarCounts(String garOrderId,Integer garRealCarCount,String orderCarType){
+        GarOrderCar originalCar = garOrderCarMapper.selectByGarOrderId(garOrderId);
+        originalCar.setGarOrderCarType(orderCarType);
+        if (originalCar != null && garRealCarCount != null && garRealCarCount > 0) {
+            for (int i = 0; i < garRealCarCount; i++) {
+                GarOrderCar newCar = getGarOrderCars(originalCar);
+                garOrderCarMapper.insertSelective(newCar);
+            }
+        }
+        return baseMapper.updateGarRealCarCount(garOrderId,garRealCarCount);
+    }
+
+    @NotNull
+    private static GarOrderCar getGarOrderCars(GarOrderCar originalCar) {
+        GarOrderCar newCar = new GarOrderCar();
+        newCar.setGarOrderId(originalCar.getGarOrderId());
+        newCar.setGarOrderCarType(originalCar.getGarOrderCarType());
+        newCar.setCarId(originalCar.getCarId());
+        newCar.setContainerVolume(originalCar.getContainerVolume());
+        newCar.setGarCreateBy(originalCar.getGarCreateBy());
+        newCar.setGarUpdateBy(originalCar.getGarUpdateBy());
+        newCar.setGarOrderCarUserType(originalCar.getGarOrderCarUserType());
+        newCar.setGarId(null);
+        newCar.setGarCreateTime(new Date());
+        newCar.setGarUpdateTime(new Date());
+        return newCar;
+    }
 }
@@ -61,4 +61,41 @@
             #{containerVolume}
         </trim>
     </insert>
+
+    <insert id="insertRandomCopyByTypeAndOrderId">
+        INSERT INTO gar_order_car (
+            gar_id,
+            gar_order_id,
+            gar_order_car_type,
+            gar_order_car_user_type,
+            gar_remark,
+            car_id,
+            gar_create_by,
+            gar_update_by,
+            gar_create_time,
+            gar_update_time,
+            container_volume
+        )
+        SELECT
+            REPLACE(UUID(), '-', ''),
+            #{garOrderId},
+            #{garOrderCarType},
+            gar_order_car_user_type,
+            gar_remark,
+            car_id,
+            gar_create_by,
+            gar_update_by,
+            NOW(),
+            NOW(),
+            container_volume
+        FROM gar_order_car
+        WHERE gar_order_id = #{garOrderId}
+          AND gar_order_car_type = #{garOrderCarType}
+        ORDER BY RAND()
+            LIMIT 1
+    </insert>
+
+    <select id="selectGarOrderCar" resultType="com.trash.garbage.pojo.domain.GarOrderCar">
+        select gar_order_car_type, count(*) as count from gar_order_car where gar_order_id = #{garOrderNo} group by gar_order_car_type
+    </select>
 </mapper>
@@ -86,7 +86,7 @@
     </select>
     <update id="updateCarCount">
-        update gar_order_match_handler set gar_car_count = gar_car_count + #{carCount} where gar_order_handler_tel = #{tel}
+        update gar_order_match_handler set gar_car_count = gar_car_count + #{carCount} where gar_order_handler_tel = #{tel} and gar_order_id = #{orderNo}
     </update>
     <select id="queryByOrderNo" resultType="com.trash.garbage.pojo.domain.GarOrderMatchHandler">