diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/PDriverController.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/PDriverController.java index 13e9b4344..0d0fc6ed2 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/PDriverController.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/PDriverController.java @@ -106,7 +106,6 @@ public class PDriverController extends BaseController } - /** * 修改司机信息 */ diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java index 50636d21c..0c0a675bf 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/controller/POrderController.java @@ -102,7 +102,7 @@ public class POrderController extends BaseController @PostMapping("/takeOrder") public AjaxResult takeOrder(@RequestBody POrder pOrder) { - return toAjax(pOrderService.takeOrder(pOrder)); + return pOrderService.takeOrder(pOrder); } /** * 修改订单信息 diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/PDriver.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/PDriver.java index 11fe91efd..e17ef6f25 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/PDriver.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/domain/PDriver.java @@ -64,7 +64,7 @@ public class PDriver extends BaseEntity /** 当前状态 */ @Excel(name = "用户当前的状态：0：审核中，1：审核通过，2：禁用") - private Integer state ; + private String state ; /** 当前状态 */ @Excel(name = "微信openId") @@ -170,11 +170,11 @@ public class PDriver extends BaseEntity return isBlacklist; } - public Integer getState() { + public String getState() { return state; } - public void setState(Integer state) { + public void setState(String state) { this.state = state; } diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PPassengerMapper.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PPassengerMapper.java index 4507d9091..005907b24 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PPassengerMapper.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/mapper/PPassengerMapper.java @@ -73,4 +73,11 @@ public interface PPassengerMapper * @return */ public PPassenger selectPPassengerByOpenId(String openId); + + /** + * 通过openId更新身份 + * @param openId + * @return + */ + public int updatePPassengerApplystate(String openId); } diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java index ce4fb7846..adb8a7612 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/IPOrderService.java @@ -82,5 +82,5 @@ public interface IPOrderService * @param pOrder 订单信息 * @return 结果 */ - public int takeOrder(POrder pOrder); + public AjaxResult takeOrder(POrder pOrder); } diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java index ef1cdfdf3..49d668020 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/IPCommonServiceImpl.java @@ -60,11 +60,13 @@ public class IPCommonServiceImpl implements IPCommonService { pOrder.setMember(currnt); /*发起者取消订单*/ if(pOrder!= null && openID.equals(pOrder.getCreaterOpenId())){ + logger.info("发起拼单者取消订单"); /*更新当前人数和状态*/ pOrderMapper.updateOrderMemberNumAndSate(pOrder); /*更新订单成员信息表*/ pCommonMapper.updateOrderMenber(commonVO); }else { + logger.info("参与拼单者取消订单"); /*更新当前人数*/ pOrderMapper.updateOrderMemberNum(pOrder); /*更新订单成员信息表*/ diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/PDriverServiceImpl.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/PDriverServiceImpl.java index 122fbe753..910364805 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/PDriverServiceImpl.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/PDriverServiceImpl.java @@ -1,6 +1,9 @@ package com.ruoyi.carpool.service.impl; import java.util.List; + +import com.ruoyi.carpool.domain.PPassenger; +import com.ruoyi.carpool.mapper.PPassengerMapper; import com.ruoyi.common.utils.DateUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.uuid.IdUtils; @@ -22,6 +25,10 @@ public class PDriverServiceImpl implements IPDriverService @Autowired private PDriverMapper pDriverMapper; + @Autowired + private PPassengerMapper pPassengerMapper; + + /** * 查询司机信息 * @@ -57,7 +64,7 @@ public class PDriverServiceImpl implements IPDriverService { pDriver.setCreateTime(DateUtils.getNowDate()); pDriver.setDriverId("driver_"+ IdUtils.randomUUID()); - pDriver.setState(0); + pDriver.setState("0"); pDriver.setIsBlacklist("0"); return pDriverMapper.insertPDriver(pDriver); } @@ -71,7 +78,13 @@ public class PDriverServiceImpl implements IPDriverService @Override public int updatePDriver(PDriver pDriver) { + if(pDriver.getOpenId() == null) return 0; pDriver.setUpdateTime(DateUtils.getNowDate()); + String state = pDriver.getState(); + /*修改状态*/ + if("1".equals(state)){ + pPassengerMapper.updatePPassengerApplystate(pDriver.getOpenId()); + } return pDriverMapper.updatePDriver(pDriver); } diff --git a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java index f09d56993..34a0bdbd9 100644 --- a/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java +++ b/ruiyi-carpool/src/main/java/com/ruoyi/carpool/service/impl/POrderServiceImpl.java @@ -181,10 +181,13 @@ public class POrderServiceImpl implements IPOrderService * @return 结果 */ @Override - public int takeOrder(POrder pOrder) + public AjaxResult takeOrder(POrder pOrder) { pOrder.setIsTake("1"); - return pOrderMapper.takeOrderById(pOrder); + pOrderMapper.takeOrderById(pOrder); + + return null ; + } diff --git a/ruiyi-carpool/src/main/resources/mapper/carpool/PPassengerMapper.xml b/ruiyi-carpool/src/main/resources/mapper/carpool/PPassengerMapper.xml index 00e4f0372..cb0dac892 100644 --- a/ruiyi-carpool/src/main/resources/mapper/carpool/PPassengerMapper.xml +++ b/ruiyi-carpool/src/main/resources/mapper/carpool/PPassengerMapper.xml @@ -146,5 +146,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + update p_passenger set apply_state = 1 where open_id = #{openId} + + + \ No newline at end of file