|
@@ -17,6 +17,8 @@ import com.ruoyi.finance.mapper.TFeeDoMapper;
|
|
import com.ruoyi.orderManagement.domain.*;
|
|
import com.ruoyi.orderManagement.domain.*;
|
|
import com.ruoyi.orderManagement.mapper.*;
|
|
import com.ruoyi.orderManagement.mapper.*;
|
|
import com.ruoyi.orderManagement.service.IftmsorderbillscarsService;
|
|
import com.ruoyi.orderManagement.service.IftmsorderbillscarsService;
|
|
|
|
+import com.ruoyi.orderManagement.statusTracking.domain.Ftmsorderbillsfees;
|
|
|
|
+import com.ruoyi.orderManagement.statusTracking.mapper.FtmsorderbillsfeesMapper;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
@@ -145,10 +147,10 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
|
|
JSONArray feesJson = JSONArray.parseArray(fees);
|
|
JSONArray feesJson = JSONArray.parseArray(fees);
|
|
List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
|
|
List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
|
|
for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
|
|
for (Ftmsorderbillsfees f : tmsorderbillsfeesList) {
|
|
- f.setFPid(pId);
|
|
|
|
|
|
+ f.setfPid(pId);
|
|
f.setOrgId(pId);
|
|
f.setOrgId(pId);
|
|
f.setActId(1020L);
|
|
f.setActId(1020L);
|
|
- f.setFBillstatus(2L);
|
|
|
|
|
|
+ f.setfBillstatus(2L);
|
|
f.setCreateBy(loginUser.getUsername());
|
|
f.setCreateBy(loginUser.getUsername());
|
|
f.setCreateTime(new Date());
|
|
f.setCreateTime(new Date());
|
|
if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {
|
|
if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(f) <= 0) {
|
|
@@ -208,9 +210,9 @@ public class FtmsorderbillscarsServiceImpl implements IftmsorderbillscarsService
|
|
JSONArray feesJson = JSONArray.parseArray(fees);
|
|
JSONArray feesJson = JSONArray.parseArray(fees);
|
|
List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
|
|
List<Ftmsorderbillsfees> tmsorderbillsfeesList = JSONObject.parseArray(feesJson.toJSONString(), Ftmsorderbillsfees.class);
|
|
for (Ftmsorderbillsfees a : tmsorderbillsfeesList) {
|
|
for (Ftmsorderbillsfees a : tmsorderbillsfeesList) {
|
|
- a.setFPid(pId);
|
|
|
|
|
|
+ a.setfPid(pId);
|
|
a.setActId(1020L);
|
|
a.setActId(1020L);
|
|
- a.setFBillstatus(6L);
|
|
|
|
|
|
+ a.setfBillstatus(6L);
|
|
a.setCreateTime(new Date());
|
|
a.setCreateTime(new Date());
|
|
a.setCreateBy(loginUser.getUsername());
|
|
a.setCreateBy(loginUser.getUsername());
|
|
if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(a) <= 0) {
|
|
if (ftmsorderbillsfeesMapper.insertFTmsorderbillsfees(a) <= 0) {
|