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

Merge Request: 添加站点名称

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

src/main/java/com/sqx/SecureApiTest.java

@@ -1,5 +1,8 @@
 package com.sqx;
 
+import com.google.gson.Gson;
+import com.sqx.modules.errand.entity.TransferRecordEntity;
+import com.sqx.modules.riderStation.entity.RiderStation;
 import icu.xuyijie.secureapi.cipher.CipherAlgorithmEnum;
 import icu.xuyijie.secureapi.cipher.CipherUtils;
 

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

@@ -711,7 +711,8 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                     log.error("第一次接单station1：" + new Gson().toJson(station));
                     if(station != null){
                         log.error("第一次接单station2：" + new Gson().toJson(station));
-                        tr.setStationName(userEntity1.getStationName());
+                        tr.setStationName(station.getStationName());
+                        log.error("第一次接单station3：" + new Gson().toJson(tr));
                     }
                     tr.setDeleteFlag(0);
                     transferRecordDao.insert(tr);
@@ -733,7 +734,8 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                     log.error("第一次接单station：" + new Gson().toJson(station));
                     if(station != null){
                         log.error("第一次接单station2：" + new Gson().toJson(station));
-                        tr.setStationName(userEntity1.getStationName());
+                        tr.setStationName(station.getStationName());
+                        log.error("第一次接单station3：" + new Gson().toJson(tr));
                     }
                     tr.setDeleteFlag(0);
                     transferRecordDao.insert(tr);
@@ -855,7 +857,7 @@ public class TbIndentServiceImpl extends ServiceImpl<TbIndentDao, TbIndent> impl
                             //获取站点内容
                             RiderStation station = riderStationService.stationById(userEntity1.getRiderStationId());
                             if(station != null){
-                                tr.setStationName(userEntity1.getStationName());
+                                tr.setStationName(station.getStationName());
                             }
                             tr.setDeleteFlag(0);
                             transferRecordDao.insert(tr);