youxiw2000 / trash · Commits

Commit bbf81559d6342e643028f29cefab5213faac3742

Authored by lichao
1 parent a03e1526
build: skipped

调整-11-17

Inline Side-by-side
Showing 7 changed files with 54 additions and 6 deletions
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
  View file @bbf8155
... ... @@ -174,9 +174,22 @@ public class GarbageOrderController {
174 174 return Result.OK(garOrderMatchAskService.queryGarOrderMatchAsks(orderId));
175 175 }
176 176  
  177 + @GetMapping("/queryErrType")
  178 + public Result<Integer> queryErrType() {
  179 + String phone = SecurityUtils.getLoginUser().getUser().getPhonenumber();
  180 + return Result.OK(garOrderMatchAskService.queryErrType(phone));
  181 + }
  182 +
  183 + @GetMapping("/queryCarCode")
  184 + public Result<List<GarOrderMatchAsk>> queryCarCode(@RequestParam String orderId) {
  185 + return Result.OK(garOrderMatchAskService.queryCarCode(orderId));
  186 + }
  187 +
177 188 @PostMapping("/sendToDriver")
178 189 public Result<Integer> sendToDriver(@RequestBody DriverSend driverSend) {
179   -
  190 + String phone = SecurityUtils.getLoginUser().getUser().getPhonenumber();
  191 + driverSend.setPhone(phone);
  192 + driverSend.setState("0");
180 193 return Result.OK(garOrderMatchAskService.addDriverSend(driverSend));
181 194 }
182 195  
... ... @@ -184,6 +197,7 @@ public class GarbageOrderController {
184 197 public Result<Integer> updateDriverSend(@RequestBody DriverSend driverSend) {
185 198 String phone = SecurityUtils.getLoginUser().getUser().getPhonenumber();
186 199 driverSend.setPhone(phone);
  200 + driverSend.setState("1");
187 201 return Result.OK(garOrderMatchAskService.updateDriverSendState(driverSend));
188 202 }
189 203  
... ...
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchAskMapper.java
  View file @bbf8155
... ... @@ -66,8 +66,12 @@ public interface GarOrderMatchAskMapper extends BaseMapper&lt;GarOrderMatchAsk&gt; {
66 66  
67 67 int queryGarOrderMatchAsks(String orderId);
68 68  
  69 + int queryErrType(String phone);
  70 +
69 71 GarOrderMatchAsk selectByGarOrderAskId(String garOrderId);
70 72  
  73 + List<GarOrderMatchAsk> queryCarCode(String orderId);
  74 +
71 75 int insertGarOrderMatchAskBySelect(GarOrderMatchAsk garOrderMatchAsk);
72 76  
73 77 int addDriverSend(DriverSend driverSend);
... ...
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchAskService.java
  View file @bbf8155
... ... @@ -67,6 +67,10 @@ public interface GarOrderMatchAskService extends IService&lt;GarOrderMatchAsk&gt; {
67 67  
68 68 int queryGarOrderMatchAsks(String orderId);
69 69  
  70 + List<GarOrderMatchAsk> queryCarCode(String orderId);
  71 +
  72 + int queryErrType(String phone);
  73 +
70 74 GarOrderMatchAsk selectByGarOrderAskId(String garOrderId);
71 75  
72 76 int insertGarOrderMatchAskBySelect(GarOrderMatchAsk garOrderMatchAsk);
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchAskServiceImpl.java
  View file @bbf8155
... ... @@ -146,6 +146,12 @@ public class GarOrderMatchAskServiceImpl extends ServiceImpl&lt;GarOrderMatchAskMap
146 146 return garOrderMatchAskMapper.queryDriverSend(phone);
147 147 };
148 148  
  149 + public List<GarOrderMatchAsk> queryCarCode(String orderId){
  150 + return garOrderMatchAskMapper.queryCarCode(orderId);
  151 + }
  152 + public int queryErrType(String phone){
  153 + return garOrderMatchAskMapper.queryErrType(phone);
  154 + }
149 155 }
150 156  
151 157  
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
  View file @bbf8155
... ... @@ -354,6 +354,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
354 354 .eq(GarOrder::getGarTimeOutFlag, GlobalStatus.GarOrderStatus.ORDER_TIME_OUT_FLAG_NO.getValue());
355 355 }
356 356 List<GarOrder> orderList = list(qw);
  357 + orderList.stream().forEach(s->{
  358 + s.setGarNowCarCount(baseMapper.queryGarNowCarCount(s.getGarOrderId()));
  359 + });
357 360 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
358 361 return pageInfo;
359 362 }
... ... @@ -361,6 +364,9 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
361 364 // 全部
362 365 if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
363 366 List<GarOrder> orderList = list(qw);
  367 + orderList.stream().forEach(s->{
  368 + s.setGarNowCarCount(baseMapper.queryGarNowCarCount(s.getGarOrderId()));
  369 + });
364 370 PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
365 371 return pageInfo;
366 372 }
... ... @@ -1800,8 +1806,10 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1800 1806 for (int i = 0; i < garRealCarCount; i++) {
1801 1807 GarOrderCar newCar = getGarOrderCar(originalCar);
1802 1808 garOrderCarMapper.insertSelective(newCar);
1803   - GarOrderMatchAsk newAsk = getGarOrderMatchAsk(garOrderMatchAsk);
1804   - garOrderMatchAskMapper.insertGarOrderMatchAskBySelect(newAsk);
  1809 + if(garOrderMatchAsk != null){
  1810 + GarOrderMatchAsk newAsk = getGarOrderMatchAsk(garOrderMatchAsk);
  1811 + garOrderMatchAskMapper.insertGarOrderMatchAskBySelect(newAsk);
  1812 + }
1805 1813 }
1806 1814 }
1807 1815 return baseMapper.updateGarRealCarCount(garOrderId,garRealCarCount);
... ... @@ -1830,6 +1838,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
1830 1838  
1831 1839 @NotNull
1832 1840 private static GarOrderMatchAsk getGarOrderMatchAsk(GarOrderMatchAsk garOrderMatchAsk) {
  1841 +
1833 1842 GarOrderMatchAsk newCar = new GarOrderMatchAsk();
1834 1843 newCar.setGarId(String.valueOf(Long.parseLong(garOrderMatchAsk.getGarId()) + 1));
1835 1844 newCar.setGarOrderId(garOrderMatchAsk.getGarOrderId());
... ...
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
  View file @bbf8155
... ... @@ -142,7 +142,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
142 142 }
143 143  
144 144 GarUser nUser = null;
145   - if (StringUtils.isNotEmpty(loginDto.getNickname())) {
  145 + if (loginDto.getSignin() != 1 && StringUtils.isNotEmpty(loginDto.getNickname())) {
146 146 QueryWrapper<GarUser> qw = new QueryWrapper<>();
147 147 qw.lambda().eq(GarUser::getGarUserName, loginDto.getNickname());
148 148 nUser = this.getOne(qw);
... ... @@ -298,9 +298,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
298 298 //随机生成6位数字验证码
299 299 String validateCode = ValidateCodeUtil.generatorCode(4);
300 300 //给用户发送验证码
301   -// SMSUtils.sendMessage("", tel, validateCode.toString(), "");
  301 + smsUtils.sendMessage(tel, validateCode.toString());
302 302 // 保存redis
303   - System.out.println("code:" + validateCode);
304 303 redisCache.setCacheObject(GlobalRedisProperties.REDIS_USER_CODE.getValue() + tel, validateCode, 60, TimeUnit.SECONDS);
305 304 return validateCode;
306 305 }
... ...
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
  View file @bbf8155
... ... @@ -29,6 +29,7 @@
29 29 <resultMap type="DriverSend" id="driverSendMap">
30 30 <result property="orderId" column="order_id" />
31 31 <result property="phone" column="phone" />
  32 + <result property="state" column="state" />
32 33 </resultMap>
33 34  
34 35 <insert id="addDriverSend" parameterType="DriverSend">
... ... @@ -212,6 +213,17 @@
212 213 select COUNT(*) from gar_order_match_ask where gar_order_id = #{orderId} and transport_distance is not null
213 214 </select>
214 215  
  216 + <select id="queryErrType" resultType="java.lang.Integer">
  217 + select count(*) from gar_order_match_ask where gar_order_handler_tel = #{phone} and gar_order_type = 1
  218 + </select>
  219 +
  220 + <select id="queryCarCode" parameterType="string" resultMap="GarOrderMatchAskResult">
  221 + SELECT gar_order_handler_name,gar_handler_car_code
  222 + FROM gar_order_match_ask
  223 + WHERE gar_order_id = #{garOrderId}
  224 + group by gar_handler_car_code
  225 + </select>
  226 +
215 227 <select id="queryGarOrderMatchAsks" resultType="java.lang.Integer">
216 228 select COUNT(*) from gar_order_match_ask where gar_order_id = #{orderId} and (transport_distance is null or transport_distance = '')
217 229 </select>
... ...