Merge branch 'master' of http://git.zthymaoyi.com/gongdecai/wangluohuoyun

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/OrderInfoController.java

@@ -93,7 +93,7 @@ public class OrderInfoController {
      * @return
      */
     @PostMapping("/api/orderReceiving")
-    public String orderReceiving(@RequestBody OrderInfo orderInfo){
+    public String orderReceiving(OrderInfo orderInfo){
         return orderInfoService.orderReceiving(orderInfo);
     }
 

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/OrderInfo.java

@@ -184,6 +184,12 @@ public class OrderInfo extends BaseModel<OrderInfo> {
     @TableField(exist = false)
     private CarrierInfo carrierInfo;
 
+    /**
+     * 还款信息表
+     */
+    @TableField(exist = false)
+    private RepaymentInfo repaymentInfo;
+
     /**
      * flag(1接受2驳回)
      */
@@ -194,6 +200,11 @@ public class OrderInfo extends BaseModel<OrderInfo> {
      */
     @TableField(exist = false)
     private String cargoOwnerPortrait;
+    /**
+     * 司机头像
+     */
+    @TableField(exist = false)
+    private String driverPortrait;
 
 
     @Override

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/RepaymentInfo.java

@@ -76,5 +76,9 @@ public class RepaymentInfo extends BaseModel<RepaymentInfo> {
     protected Serializable pkVal() {
         return this.id;
     }
+    public static class QueryFiles {
 
+        public static final String ORDER_ID = "order_id";
+
+    }
 }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/OrderInfoServiceImpl.java

@@ -11,6 +11,7 @@ import com.yh.saas.plugin.yiliangyiyun.service.*;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -37,6 +38,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
     private ICommonUserService commonUserService;
     @Autowired
     private INewsInfoService newsInfoService;
+    @Autowired
+    private IRepaymentInfoService repaymentInfoService;
 
     /**
      * 司机订单列表
@@ -127,12 +130,23 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         if(freightInfo != null){
             orderInfo.setFreightInfo(freightInfo);
         }
+        //还款信息
+        RepaymentInfo repaymentInfo = repaymentInfoService.selectOne(new EntityWrapper<RepaymentInfo>().eq(RepaymentInfo.QueryFiles.ORDER_ID,id));
+        if(repaymentInfo != null){
+            orderInfo.setRepaymentInfo(repaymentInfo);
+        }
         //查询货主头像
         CommonUser commonUser = commonUserService.selectOne(new EntityWrapper<CommonUser>()
                 .eq("id",orderInfo.getCargoCommonId()));
         if(commonUser != null){
             orderInfo.setCargoOwnerPortrait(commonUser.getAvatarUrl());
         }
+        //查询司机头像
+        CommonUser commonUser1 = commonUserService.selectOne(new EntityWrapper<CommonUser>()
+                .eq("id",orderInfo.getCommonId()));
+        if(commonUser1 != null){
+            orderInfo.setDriverPortrait(commonUser1.getAvatarUrl());
+        }
         return orderInfo;
     }
 
@@ -142,6 +156,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
      * @return
      */
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public String end (OrderInfo orderInfo){
         //查询订单
         OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
@@ -246,7 +261,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         OrderInfo orderInfo1 = this.selectById(orderInfo.getId());
         if(orderInfo1 != null){
             //接单
-            if("1".equals(orderInfo1.getFlag())){
+            if("1".equals(orderInfo.getFlag())){
                 //司机端和货主端订单状态改为未装车
                 orderInfo1.setOrderStatusKey(StatusEnum.DRIVER_ORDER_LOADING.getFlag());
                 orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_LOADING.getName());
@@ -255,6 +270,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 //新增消息
                 NewsInfo newsInfo = new NewsInfo();
                 newsInfo.setNumber(orderInfo1.getOrderNo());
+                newsInfo.setBussId(orderInfo1.getId());
                 newsInfo.setCrtCommonId(orderInfo1.getCargoCommonId());
                 newsInfo.setReCommonId(orderInfo1.getCommonId());
                 newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "货主已接单");
@@ -269,6 +285,16 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
                 orderInfo1.setOrderStatus(StatusEnum.DRIVER_ORDER_END.getName());
                 orderInfo1.setCargoOwnerStatusKey(StatusEnum.OWNER_ORDER_END.getFlag());
                 orderInfo1.setCargoOwnerStatus(StatusEnum.OWNER_ORDER_END.getName());
+                //新增消息
+                NewsInfo newsInfo = new NewsInfo();
+                newsInfo.setNumber(orderInfo1.getOrderNo());
+                newsInfo.setBussId(orderInfo1.getId());
+                newsInfo.setCrtCommonId(orderInfo1.getCargoCommonId());
+                newsInfo.setReCommonId(orderInfo1.getCommonId());
+                newsInfo.setNewsContent("订单编号" + orderInfo1.getOrderNo() + "货主已拒单");
+                newsInfo.setNewsTypeKey("2");
+                newsInfo.setNewsType("承运通知");
+                newsInfoService.addNewsInfo(newsInfo);
             }
             this.updateById(orderInfo1);
         }

winsea-haixin-plugin-wangluohuoyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/PublishTaskInfoServiceImpl.java

@@ -40,6 +40,8 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
     private IFreightInfoService freightInfoService;
     @Autowired
     private INewsInfoService newsInfoService;
+    @Autowired
+    private IRepaymentInfoService repaymentInfoService;
 
     /**
      * 地球半径,单位 km
@@ -318,7 +320,12 @@ public class PublishTaskInfoServiceImpl extends ServiceImpl<PublishTaskInfoMappe
         freightInfo.setId(IdGenerator.generateUUID());
         freightInfo.setOrderId(orderInfo.getId());
         boolean tre = freightInfoService.insert(freightInfo);
-        if( one && two && tre){
+        //新增还款信息
+        RepaymentInfo repaymentInfo = new RepaymentInfo();
+        repaymentInfo.setId(IdGenerator.generateUUID());
+        repaymentInfo.setOrderId(orderInfo.getId());
+        boolean four = repaymentInfoService.insert(repaymentInfo);
+        if( one && two && tre && four){
             return "ok";
         } else {
             return "NG";