|
@@ -242,9 +242,13 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
|
|
//尾款
|
|
//尾款
|
|
freightInfo.setFreightBalance(hyFreightSettlementInfo1.getAmountMoney());
|
|
freightInfo.setFreightBalance(hyFreightSettlementInfo1.getAmountMoney());
|
|
freightInfo.setFreightBalanceDate(new Date());
|
|
freightInfo.setFreightBalanceDate(new Date());
|
|
|
|
+ freightInfo.setOwnerFreightBalance(freightInfo.getFreightBalance() + freightInfo.getDriverServiceCharge());
|
|
|
|
+ freightInfo.setOwnerFreightBalanceDate(new Date());
|
|
Double d = freightInfo.getPayabledFreight();
|
|
Double d = freightInfo.getPayabledFreight();
|
|
freightInfo.setPayabledFreight(d + hyFreightSettlementInfo1.getAmountMoney());
|
|
freightInfo.setPayabledFreight(d + hyFreightSettlementInfo1.getAmountMoney());
|
|
freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
|
|
freightInfo.setNopayableFreight(freightInfo.getPayableFreight() - freightInfo.getPayabledFreight());
|
|
|
|
+ freightInfo.setProfit(freightInfo.getReceivableFreight()-freightInfo.getPayableFreight());
|
|
|
|
+ freightInfo.setProfitDate(new Date());
|
|
//修改订单运费
|
|
//修改订单运费
|
|
if (orderInfo1 != null) {
|
|
if (orderInfo1 != null) {
|
|
orderInfo1.setFreight(freightInfo.getPrepaidFreight() + freightInfo.getFreightBalance());
|
|
orderInfo1.setFreight(freightInfo.getPrepaidFreight() + freightInfo.getFreightBalance());
|
|
@@ -279,13 +283,19 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
|
|
//查询银行key值
|
|
//查询银行key值
|
|
HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
|
|
HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
|
|
.eq("const_id", "BANK1").eq("const_value", orderInfo1.getBankDeposit()));
|
|
.eq("const_id", "BANK1").eq("const_value", orderInfo1.getBankDeposit()));
|
|
- hyFreightSettlementInfo1.setBankKey(hyCommonSysParameter.getConstKey());
|
|
|
|
|
|
+ if (hyCommonSysParameter == null){
|
|
|
|
+ hyFreightSettlementInfo1.setBankKey("9999");
|
|
|
|
+ }else {
|
|
|
|
+ hyFreightSettlementInfo1.setBankKey(hyCommonSysParameter.getConstKey());
|
|
|
|
+ }
|
|
//上报
|
|
//上报
|
|
String token = EntityAnalyse.GetJTToken();
|
|
String token = EntityAnalyse.GetJTToken();
|
|
hyFreightSettlementInfo1.setToken(token);
|
|
hyFreightSettlementInfo1.setToken(token);
|
|
EntityAnalyse.uploadFlowSheet(hyFreightSettlementInfo1);
|
|
EntityAnalyse.uploadFlowSheet(hyFreightSettlementInfo1);
|
|
//编辑信息
|
|
//编辑信息
|
|
this.updateById(hyFreightSettlementInfo1);
|
|
this.updateById(hyFreightSettlementInfo1);
|
|
|
|
+ //修改运费信息
|
|
|
|
+ freightInfoService.updateById(freightInfo);
|
|
}
|
|
}
|
|
return "ok";
|
|
return "ok";
|
|
}
|
|
}
|
|
@@ -355,6 +365,26 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
|
|
String token = EntityAnalyse.GetJTToken();
|
|
String token = EntityAnalyse.GetJTToken();
|
|
if (CollectionUtils.isNotEmpty(hyFreightSettlementInfo.getHyFreightSettlementInfos())){
|
|
if (CollectionUtils.isNotEmpty(hyFreightSettlementInfo.getHyFreightSettlementInfos())){
|
|
for (HyFreightSettlementInfo hyFreightSettlementInfo1 : hyFreightSettlementInfo.getHyFreightSettlementInfos()){
|
|
for (HyFreightSettlementInfo hyFreightSettlementInfo1 : hyFreightSettlementInfo.getHyFreightSettlementInfos()){
|
|
|
|
+ //查询上报所需信息
|
|
|
|
+ //查询订单
|
|
|
|
+ OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
|
|
|
|
+ //司机信息
|
|
|
|
+ HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
|
|
|
|
+ .eq("common_id",hyFreightSettlementInfo1.getCommonId()).eq("delete_flag","0"));
|
|
|
|
+ hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverSex(hyDriverInfo.getDriverSex());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverBirthday(hyDriverInfo.getDriverBirthday());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverPhone(hyDriverInfo.getDriverPhone());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverAddress(hyDriverInfo.getCardAddress());
|
|
|
|
+ //车辆信息
|
|
|
|
+ HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
|
|
|
|
+ .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
|
|
|
|
+ hyFreightSettlementInfo1.setCarNumber(hyDriverCarInfo.getCarNumber());
|
|
|
|
+ hyFreightSettlementInfo1.setCarNumberColour(hyDriverCarInfo.getCarNumberColour());
|
|
|
|
+ //查询银行key值
|
|
|
|
+ HyCommonSysParameter hyCommonSysParameter = commonSysParameterService.selectOne(new EntityWrapper<HyCommonSysParameter>()
|
|
|
|
+ .eq("const_id", "BANK1").eq("const_value", orderInfo1.getBankDeposit()));
|
|
|
|
+ hyFreightSettlementInfo1.setBankKey(hyCommonSysParameter.getConstKey());
|
|
//上报
|
|
//上报
|
|
hyFreightSettlementInfo1.setToken(token);
|
|
hyFreightSettlementInfo1.setToken(token);
|
|
EntityAnalyse.uploadFlowSheet(hyFreightSettlementInfo1);
|
|
EntityAnalyse.uploadFlowSheet(hyFreightSettlementInfo1);
|
|
@@ -366,4 +396,35 @@ public class HyFreightSettlementInfoServiceImpl extends ServiceImpl<HyFreightSet
|
|
}
|
|
}
|
|
return "ok";
|
|
return "ok";
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * 流水单查看
|
|
|
|
+ * @param hyFreightSettlementInfo
|
|
|
|
+ * @return
|
|
|
|
+ * @throws IOException
|
|
|
|
+ * @throws ParseException
|
|
|
|
+ */
|
|
|
|
+ @Override
|
|
|
|
+ public HyFreightSettlementInfo getHyFreightSettlementInfo(HyFreightSettlementInfo hyFreightSettlementInfo){
|
|
|
|
+ //查询流水单信息
|
|
|
|
+ HyFreightSettlementInfo hyFreightSettlementInfo1 = this.selectById(hyFreightSettlementInfo.getId());
|
|
|
|
+ //查询订单
|
|
|
|
+ OrderInfo orderInfo1 = orderInfoService.selectById(hyFreightSettlementInfo1.getOrderId());
|
|
|
|
+ //司机信息
|
|
|
|
+ HyDriverInfo hyDriverInfo = driverInfoService.selectOne(new EntityWrapper<HyDriverInfo>()
|
|
|
|
+ .eq("common_id",hyFreightSettlementInfo1.getCommonId()).eq("delete_flag","0"));
|
|
|
|
+ hyFreightSettlementInfo1.setDriverIdCard(hyDriverInfo.getNumberCard());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverSex(hyDriverInfo.getDriverSex());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverBirthday(hyDriverInfo.getDriverBirthday());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverPhone(hyDriverInfo.getDriverPhone());
|
|
|
|
+ hyFreightSettlementInfo1.setDriverAddress(hyDriverInfo.getCardAddress());
|
|
|
|
+ //车辆信息
|
|
|
|
+ HyDriverCarInfo hyDriverCarInfo = driverCarInfoService.selectOne(new EntityWrapper<HyDriverCarInfo>()
|
|
|
|
+ .eq("car_number",orderInfo1.getCarNumber()).eq("delete_flag","0"));
|
|
|
|
+ if (hyDriverCarInfo != null){
|
|
|
|
+ hyFreightSettlementInfo1.setCarNumber(hyDriverCarInfo.getCarNumber());
|
|
|
|
+ hyFreightSettlementInfo1.setCarNumberColour(hyDriverCarInfo.getCarNumberColour());
|
|
|
|
+ }
|
|
|
|
+ return hyFreightSettlementInfo1;
|
|
|
|
+ }
|
|
}
|
|
}
|