youxiw2000 / trash · Commits

Commit 61af9557ea079a36722aa2c3961c931fd38d7f89

Authored by lichao
1 parent fb3969ba

调整-11-28

Inline Side-by-side
Showing 13 changed files with 117 additions and 10 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @61af955
... ... @@ -28,10 +28,7 @@ import com.trash.framework.web.service.TokenService;
28 28 import com.trash.garbage.custom.BizException;
29 29 import com.trash.garbage.global.Result;
30 30 import com.trash.garbage.global.ResultCode;
31   -import com.trash.garbage.pojo.domain.DriverSend;
32   -import com.trash.garbage.pojo.domain.GarOrder;
33   -import com.trash.garbage.pojo.domain.GarOrderMatchAsk;
34   -import com.trash.garbage.pojo.domain.GarOrderMatchDisposal;
  31 +import com.trash.garbage.pojo.domain.*;
35 32 import com.trash.garbage.service.*;
36 33 import com.trash.garbage.pojo.dto.*;
37 34 import com.trash.garbage.pojo.vo.GarOrderMatchAskVo;
... ... @@ -76,6 +73,8 @@ public class GarbageOrderController {
76 73 private GarAddressService garAddressService;
77 74 @Autowired
78 75 private GarOrderMatchHandlerService garOrderMatchHandlerService;
  76 + @Autowired
  77 + private GarOrderCarService garOrderCarService;
79 78  
80 79 @PostMapping("/add")
81 80 @Log(title = "创建订单", businessType = BusinessType.INSERT)
... ... @@ -269,7 +268,21 @@ public class GarbageOrderController {
269 268 public Result<?> updateCarCount(@RequestBody Map<String, String> params) {
270 269 String carCount = params.get("carCount");
271 270 String tel = params.get("tel");
272   - return Result.OK(garOrderMatchHandlerService.updateCarCount(carCount,tel));
  271 + String orderNo = params.get("orderNo");
  272 + return Result.OK(garOrderMatchHandlerService.updateCarCount(carCount,tel,orderNo));
  273 + }
  274 +
  275 + @GetMapping("/selectGarOrderCar/{orderNo}")
  276 + public Result<?> selectGarOrderCar(@PathVariable("orderNo") String orderNo) {
  277 + return Result.OK(garOrderCarService.selectGarOrderCar(orderNo));
  278 + }
  279 +
  280 + @PostMapping("/insertRandomCopyByTypeAndOrderId")
  281 + public Result<?> insertRandomCopyByTypeAndOrderId(@RequestBody Map<String, String> params) {
  282 + String orderId = params.get("orderNo");
  283 + String orderCarType = params.get("orderCarType");
  284 + String count = params.get("carCount");
  285 + return Result.OK(garOrderService.updateGarRealCarCounts(orderId,Integer.parseInt(count),orderCarType));
273 286 }
274 287  
275 288 @GetMapping("/queryByOrderNo/{orderNo}")
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderCarMapper.java
  View file @61af955
... ... @@ -2,6 +2,9 @@ package com.trash.garbage.mapper;
2 2  
3 3 import com.trash.garbage.pojo.domain.GarOrderCar;
4 4 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  5 +import org.apache.ibatis.annotations.Param;
  6 +
  7 +import java.util.List;
5 8  
6 9 /**
7 10 * @author 20412
... ... @@ -12,6 +15,9 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
12 15 public interface GarOrderCarMapper extends BaseMapper<GarOrderCar> {
13 16 GarOrderCar selectByGarOrderId(String garOrderId);
14 17 int insertSelective(GarOrderCar garOrderCar);
  18 + List<GarOrderCar> selectGarOrderCar(String garOrderNo);
  19 +
  20 + int insertRandomCopyByTypeAndOrderId(@Param("garOrderId")String garOrderId,@Param("garOrderCarType") String garOrderCarType);
15 21 }
16 22  
17 23  
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
  View file @61af955
... ... @@ -25,7 +25,7 @@ public interface GarOrderMatchHandlerMapper extends BaseMapper&lt;GarOrderMatchHand
25 25  
26 26 String queryCarCountByTel(@Param("tel") String tel);
27 27  
28   - int updateCarCount(@Param("carCount") String carCount ,@Param("tel") String tel);
  28 + int updateCarCount(@Param("carCount") String carCount ,@Param("tel") String tel ,@Param("orderNo") String orderNo);
29 29  
30 30 List<GarOrderMatchHandler> queryByOrderNo(@Param("orderNo") String orderNo);
31 31  
... ...
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
  View file @61af955
... ... @@ -78,6 +78,9 @@ public class GarOrderCar implements Serializable {
78 78 @TableField(exist = false)
79 79 private static final long serialVersionUID = 1L;
80 80  
  81 + @TableField(exist = false)
  82 + private String count;
  83 +
81 84  
82 85  
83 86 public String getPlateNo() {
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderCarService.java
  View file @61af955
... ... @@ -16,4 +16,8 @@ public interface GarOrderCarService extends IService&lt;GarOrderCar&gt; {
16 16 List<GarOrderCar> queryByOrderId(String orderId);
17 17  
18 18 List<GarOrderMatchHandler> queryGarOrderMatchHandler( String orderId);
  19 +
  20 + List<GarOrderCar> selectGarOrderCar(String garOrderNo);
  21 +
  22 + int insertRandomCopyByTypeAndOrderId(String garOrderId,String garOrderCarType);
19 23 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
  View file @61af955
... ... @@ -19,7 +19,7 @@ public interface GarOrderMatchHandlerService extends IService&lt;GarOrderMatchHandl
19 19 List<GarOrderMatchHandler> queryByOrderId(String orderId);
20 20 String queryOrderNo(String carCode);
21 21 String queryCarCountByTel(String tel);
22   - int updateCarCount(String carCount,String tel);
  22 + int updateCarCount(String carCount,String tel,String orderNo);
23 23 List<GarOrderMatchHandler> queryByOrderNo(String orderNo);
24 24 List<GarOrderMatchHandler> queryByOrderNoDriver(String orderNo,String phone);
25 25 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderService.java
  View file @61af955
... ... @@ -117,4 +117,6 @@ public interface GarOrderService extends IService&lt;GarOrder&gt; {
117 117  
118 118 List<GarOrderMatchHandler> getGarOrderMatchHandlers(String garOrderId);
119 119  
  120 + int updateGarRealCarCounts(String garOrderId,Integer garRealCarCount,String orderCarType);
  121 +
120 122 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderCarServiceImpl.java
  View file @61af955
... ... @@ -24,6 +24,9 @@ public class GarOrderCarServiceImpl extends ServiceImpl&lt;GarOrderCarMapper, GarOr
24 24  
25 25 @Autowired
26 26 private GarOrderMatchHandlerMapper garOrderMatchHandlerMapper;
  27 + @Autowired
  28 + private GarOrderCarMapper garOrderCarMapper;
  29 +
27 30 @Override
28 31 public List<GarOrderCar> queryByOrderId(String orderId) {
29 32 LambdaQueryWrapper<GarOrderCar> wrapper = new LambdaQueryWrapper<>();
... ... @@ -35,6 +38,16 @@ public class GarOrderCarServiceImpl extends ServiceImpl&lt;GarOrderCarMapper, GarOr
35 38 public List<GarOrderMatchHandler> queryGarOrderMatchHandler(String orderId) {
36 39 return garOrderMatchHandlerMapper.queryGarOrderMatchHandler(orderId);
37 40 }
  41 +
  42 + @Override
  43 + public List<GarOrderCar> selectGarOrderCar(String garOrderNo) {
  44 + return garOrderCarMapper.selectGarOrderCar(garOrderNo);
  45 + }
  46 +
  47 + @Override
  48 + public int insertRandomCopyByTypeAndOrderId(String garOrderId, String garOrderCarType) {
  49 + return garOrderCarMapper.insertRandomCopyByTypeAndOrderId(garOrderId, garOrderCarType);
  50 + }
38 51 }
39 52  
40 53  
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchDisposalServiceImpl.java
  View file @61af955
... ... @@ -58,6 +58,7 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
58 58 }
59 59  
60 60 HashMap hash = JSON.parseObject(json, HashMap.class);
  61 +
61 62 if (!StringUtils.equals(String.valueOf(hash.get("code")), "200")) {
62 63 log.warn("json code no equals 200");
63 64 return Collections.emptyList();
... ... @@ -141,6 +142,7 @@ public class GarOrderMatchDisposalServiceImpl extends ServiceImpl&lt;GarOrderMatchD
141 142 params.put("tag", 1);
142 143 params.put("page", 1);
143 144 params.put("size", 1000);
  145 + params.put("overdue", 0);
144 146  
145 147 return com.trash.garbage.utils.HttpUtil.doPost("/api/siteservice/cs/earthsites/ledger/list", JSON.toJSONString(params));
146 148 }
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
  View file @61af955
... ... @@ -44,8 +44,8 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
44 44 }
45 45  
46 46 @Override
47   - public int updateCarCount(String carCount , String tel) {
48   - return baseMapper.updateCarCount(carCount, tel);
  47 + public int updateCarCount(String carCount , String tel ,String orderNo) {
  48 + return baseMapper.updateCarCount(carCount, tel ,orderNo);
49 49 }
50 50  
51 51 @Override
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @61af955
... ... @@ -1882,6 +1882,33 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1882 1882 return newCar;
1883 1883 }
1884 1884  
  1885 + public int updateGarRealCarCounts(String garOrderId,Integer garRealCarCount,String orderCarType){
  1886 + GarOrderCar originalCar = garOrderCarMapper.selectByGarOrderId(garOrderId);
  1887 + originalCar.setGarOrderCarType(orderCarType);
  1888 + if (originalCar != null && garRealCarCount != null && garRealCarCount > 0) {
  1889 + for (int i = 0; i < garRealCarCount; i++) {
  1890 + GarOrderCar newCar = getGarOrderCars(originalCar);
  1891 + garOrderCarMapper.insertSelective(newCar);
  1892 + }
  1893 + }
  1894 + return baseMapper.updateGarRealCarCount(garOrderId,garRealCarCount);
  1895 + }
  1896 +
  1897 + @NotNull
  1898 + private static GarOrderCar getGarOrderCars(GarOrderCar originalCar) {
  1899 + GarOrderCar newCar = new GarOrderCar();
  1900 + newCar.setGarOrderId(originalCar.getGarOrderId());
  1901 + newCar.setGarOrderCarType(originalCar.getGarOrderCarType());
  1902 + newCar.setCarId(originalCar.getCarId());
  1903 + newCar.setContainerVolume(originalCar.getContainerVolume());
  1904 + newCar.setGarCreateBy(originalCar.getGarCreateBy());
  1905 + newCar.setGarUpdateBy(originalCar.getGarUpdateBy());
  1906 + newCar.setGarOrderCarUserType(originalCar.getGarOrderCarUserType());
  1907 + newCar.setGarId(null);
  1908 + newCar.setGarCreateTime(new Date());
  1909 + newCar.setGarUpdateTime(new Date());
  1910 + return newCar;
  1911 + }
1885 1912  
1886 1913 }
1887 1914  
... ...
trash-garbage/src/main/resources/mapper/GarOrderCarMapper.xml
  View file @61af955
... ... @@ -61,4 +61,41 @@
61 61 #{containerVolume}
62 62 </trim>
63 63 </insert>
  64 +
  65 + <insert id="insertRandomCopyByTypeAndOrderId">
  66 + INSERT INTO gar_order_car (
  67 + gar_id,
  68 + gar_order_id,
  69 + gar_order_car_type,
  70 + gar_order_car_user_type,
  71 + gar_remark,
  72 + car_id,
  73 + gar_create_by,
  74 + gar_update_by,
  75 + gar_create_time,
  76 + gar_update_time,
  77 + container_volume
  78 + )
  79 + SELECT
  80 + REPLACE(UUID(), '-', ''),
  81 + #{garOrderId},
  82 + #{garOrderCarType},
  83 + gar_order_car_user_type,
  84 + gar_remark,
  85 + car_id,
  86 + gar_create_by,
  87 + gar_update_by,
  88 + NOW(),
  89 + NOW(),
  90 + container_volume
  91 + FROM gar_order_car
  92 + WHERE gar_order_id = #{garOrderId}
  93 + AND gar_order_car_type = #{garOrderCarType}
  94 + ORDER BY RAND()
  95 + LIMIT 1
  96 + </insert>
  97 +
  98 + <select id="selectGarOrderCar" resultType="com.trash.garbage.pojo.domain.GarOrderCar">
  99 + select gar_order_car_type, count(*) as count from gar_order_car where gar_order_id = #{garOrderNo} group by gar_order_car_type
  100 + </select>
64 101 </mapper>
... ...
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
  View file @61af955
... ... @@ -86,7 +86,7 @@
86 86 </select>
87 87  
88 88 <update id="updateCarCount">
89   - update gar_order_match_handler set gar_car_count = gar_car_count + #{carCount} where gar_order_handler_tel = #{tel}
  89 + update gar_order_match_handler set gar_car_count = gar_car_count + #{carCount} where gar_order_handler_tel = #{tel} and gar_order_id = #{orderNo}
90 90 </update>
91 91  
92 92 <select id="queryByOrderNo" resultType="com.trash.garbage.pojo.domain.GarOrderMatchHandler">
... ...