diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java index 5b440e434c..df25ace011 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java @@ -108,4 +108,7 @@ public class BusOrder extends BaseEntity { @ApiModelProperty(value = "分公司sid") private String useOrgSid; + + @ApiModelProperty("单台开票金额") + private BigDecimal oneBillMoney; // 单台开票金额 } diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java index 582c768be9..fe833a7692 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java @@ -189,4 +189,6 @@ public interface BusOrderFeign { */ @PostMapping("/doneTaskList/{userSid}") public ResultBean doneTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid,@ApiParam(value = "变量集合,json对象") @RequestBody PagerQuery pQuery); + + void updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java index a07dae04e5..f111a07c66 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java @@ -81,4 +81,7 @@ public class BusOrderVo implements Vo { @ApiModelProperty(value = "提车方式") private String saleTypeKey; + + @ApiModelProperty("单台开票金额") + private String oneBillMoney; // 单台开票金额 } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java index e07aefa15b..f83f04014e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java @@ -9,6 +9,7 @@ import com.yxt.anrui.buscenter.api.busorder.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; import java.util.List; @@ -77,4 +78,6 @@ public interface BusOrderMapper extends BaseMapper { int selectCountByOrgSidAndMonth(@Param("orgSid") String orgSid); + @Update("update bus_order set oneBillMoney = #{oneBillMoney} where sid = #{orderSid}") + void updateOneBillMoneyByOrderSid(@Param("orderSid") String orderSid,@Param("oneBillMoney") String oneBillMoney); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java index 76b472b9da..79111f32e3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java @@ -500,5 +500,10 @@ public class BusOrderRest implements BusOrderFeign { public ResultBean doneTaskList(@ApiParam(value = "用户sid") @PathVariable(value = "userSid") String userSid, PagerQuery pQuery) {//已办列表 return busOrderService.doneTaskList(userSid,pQuery); } + + @Override + public void updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) { + busOrderService.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney); + } /***********-------------流程----------********************/ } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java index b5b176346d..115498741a 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java @@ -989,4 +989,8 @@ public class BusOrderService extends MybatisBaseService createQueryWrapper(FinBillApplicationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -351,6 +353,17 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); + CommonContractVo data = commonContractVoResultBean.getData(); + String busSid = data.getBusSid(); + ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(busSid); + BusOrderVo data1 = busOrderVoResultBean.getData(); + String orderSid = data1.getOrderSid(); + if (StringUtils.isNotBlank(oneBillMoney)){ + busOrderFeign.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney); + } updateBySid(dto, dtoSid); BeanUtil.copyProperties(finBillApplicationPublic, finBillApplicationPublicDto); finBillApplicationPublicService.updateBySid(finBillApplicationPublicDto, billAppPublicSid); @@ -385,10 +398,17 @@ public class FinBillApplicationService extends MybatisBaseService commonContractVoResultBean = commonContractFeign.fetchBySid(sid1); + CommonContractVo data = commonContractVoResultBean.getData(); + String busSid = data.getBusSid(); + ResultBean busOrderVoResultBean = busOrderFeign.fetchSid(busSid); + BusOrderVo data1 = busOrderVoResultBean.getData(); + String oneBillMoney = data1.getOneBillMoney(); + if (StringUtils.isBlank(oneBillMoney)){ vo.setOneBillState("0"); - } else { + }else { + vo.setOneBillMoney(oneBillMoney); vo.setOneBillState("1"); } List finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);