Accept Merge Request #99: (dev-xwt -> dev-test)

Merge Request: 接单加记录

Created By: @夏文涛
Accepted By: @夏文涛
URL: https://chuanghaikeji.coding.net/p/moxuanyunshangwaimai/d/backend/git/merge/99?initial=true

src/main/java/com/sqx/modules/errand/service/impl/TbIndentServiceImpl.java

@@ -58,6 +58,8 @@ import com.sqx.modules.pay.dao.PayDetailsDao;
 import com.sqx.modules.pay.entity.PayDetails;
 import com.sqx.modules.pay.service.WxService;
 import com.sqx.modules.printInfo.entity.PrintInfo;
+import com.sqx.modules.riderStation.entity.RiderStation;
+import com.sqx.modules.riderStation.service.RiderStationService;
 import com.sqx.modules.shop.service.ShopMessageService;
 import com.sqx.modules.utils.HttpClientUtil;
 import com.sqx.modules.utils.SenInfoCheckUtil;
@@ -111,6 +113,9 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
     private PayDetailsDao payDetailsDao;
     @Autowired
     private WxService wxService;
+
+    @Autowired
+    private RiderStationService riderStationService;
     @Autowired
     private AliPayController aliPayController;
     @Lazy
@@ -694,6 +699,19 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                 }
                 if ("4".equals(tbIndent.getIndentType())) {
                     tbIndentDao.indentReceiv(userId, indentNumber, format, "4");
+                    TransferRecordEntity tr = new TransferRecordEntity();
+                    tr.setUserId(userEntity1.getUserId());
+                    tr.setUserName(userEntity1.getUserName());
+                    tr.setUserPhone(userEntity1.getPhone());
+                    tr.setOrderId(tbIndent.getOrderId());
+                    tr.setReceveTime(format);
+                    //获取站点内容
+                    RiderStation station = riderStationService.stationById(userEntity1.getRiderStationId());
+                    if(station != null){
+                        tr.setStationName(userEntity1.getStationName());
+                    }
+                    tr.setDeleteFlag(0);
+                    transferRecordDao.insert(tr);
                 } else {
                     TbOrder tbOrder = appOrderService.getById(tbIndent.getOrderId());
                     if (!Integer.valueOf(2).equals(tbOrder.getOrderTypeExtra())) {
@@ -701,7 +719,23 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                     }
 
                     tbIndentDao.indentReceiving(userId, indentNumber, format);
+                    TransferRecordEntity tr = new TransferRecordEntity();
+                    tr.setUserId(userEntity1.getUserId());
+                    tr.setUserName(userEntity1.getUserName());
+                    tr.setUserPhone(userEntity1.getPhone());
+                    tr.setOrderId(tbIndent.getOrderId());
+                    tr.setReceveTime(format);
+                    //获取站点内容
+                    RiderStation station = riderStationService.stationById(userEntity1.getRiderStationId());
+                    if(station != null){
+                        tr.setStationName(userEntity1.getStationName());
+                    }
+                    tr.setDeleteFlag(0);
+                    transferRecordDao.insert(tr);
                 }
+
+
+
             } finally {
                 lock.unlock();
             }
@@ -806,6 +840,20 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                     if ("5".equals(tbIndent.getIndentType())) {
                         if ("2".equals(tbIndent.getIndentState()) || "3".equals(tbIndent.getIndentState())) {
                             tbIndentDao.orderIndentReceiv(userId, acquireCode, format, "4");
+
+                            TransferRecordEntity tr = new TransferRecordEntity();
+                            tr.setUserId(userEntity1.getUserId());
+                            tr.setUserName(userEntity1.getUserName());
+                            tr.setUserPhone(userEntity1.getPhone());
+                            tr.setOrderId(tbIndent.getOrderId());
+                            tr.setReceveTime(format);
+                            //获取站点内容
+                            RiderStation station = riderStationService.stationById(userEntity1.getRiderStationId());
+                            if(station != null){
+                                tr.setStationName(userEntity1.getStationName());
+                            }
+                            tr.setDeleteFlag(0);
+                            transferRecordDao.insert(tr);
                         }
                     }
 
@@ -1875,6 +1923,12 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
             throw new SqxException("骑手保证金不足！");
         }
 
+        //获取站点内容
+        RiderStation station = riderStationService.stationById(userEntity.getRiderStationId());
+        if(station != null){
+            userEntity.setStationName(station.getStationName());
+        }
+
         return userEntity;
     }
 

src/main/java/com/sqx/modules/riderStation/service/RiderStationService.java

@@ -12,6 +12,8 @@ public interface RiderStationService extends IService<RiderStation> {
 
     Result selectStationList(Integer page, Integer size);
 
+    RiderStation stationById(Integer id);
+
     Result stationList();
 
     Result getRiderStationName(Integer userId);

src/main/java/com/sqx/modules/riderStation/service/impl/RiderStationServiceImpl.java

@@ -37,6 +37,11 @@ public class RiderStationServiceImpl extends ServiceImpl<RiderStationDao, RiderS
         this.save(riderStation);
         return Result.success();
     }
+    @Override
+    public RiderStation stationById(Integer id){
+        RiderStation result= baseMapper.selectById(id);
+        return result;
+    }
 
     @Override
     public Result selectStationList(Integer page, Integer size) {