Browse Source

开票申请提交接口逻辑判断高低开。

销售订单中判断开票金额是否为空,为空开票金额输入,不为空开票金额不可修改。
master
God 3 years ago
parent
commit
956da146ae
  1. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrder.java
  2. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderFeign.java
  3. 3
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busorder/BusOrderVo.java
  4. 3
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderMapper.java
  5. 5
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderRest.java
  6. 4
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busorder/BusOrderService.java
  7. 30
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

3
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; // 单台开票金额
}

2
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<TaskQuery> pQuery);
void updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney);
}

3
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; // 单台开票金额
}

3
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<BusOrder> {
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);
}

5
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<TaskQuery> pQuery) {//已办列表
return busOrderService.doneTaskList(userSid,pQuery);
}
@Override
public void updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
busOrderService.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney);
}
/***********-------------流程----------********************/
}

4
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<BusOrderMapper, BusOrder
busOrderDiscountService.deleteBySid(s);
}
}
public void updateOneBillMoneyByOrderSid(String orderSid,String oneBillMoney) {
baseMapper.updateOneBillMoneyByOrderSid(orderSid,oneBillMoney);
}
}

30
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -34,12 +34,13 @@ import com.yxt.anrui.base.api.commonappendix.CommonAppendixVo;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContractVo;
import com.yxt.anrui.buscenter.api.busorder.BusOrderFeign;
import com.yxt.anrui.buscenter.api.busorder.BusOrderVo;
import com.yxt.anrui.buscenter.api.busordermodel.BusOrderModelFeign;
import com.yxt.anrui.fin.api.finbillapplication.*;
import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublic;
import com.yxt.anrui.fin.api.finbillapplicationpublic.FinBillApplicationPublicDto;
import com.yxt.anrui.fin.api.finbillfile.FinBillFile;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileDto;
import com.yxt.anrui.fin.api.finbillfile.FinBillFileVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicle;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
@ -62,7 +63,6 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.config.component.FileUploadComponent;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
@ -119,6 +119,8 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
private BusOrderModelFeign busOrderModelFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
@Autowired
private BusOrderFeign busOrderFeign;
private QueryWrapper<FinBillApplication> createQueryWrapper(FinBillApplicationQuery query) {
// todo: 这里根据具体业务调整查询条件
@ -351,6 +353,17 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
FinBillApplicationPublic finBillApplicationPublic = finBillApplicationPublicService.fetchBySid(billAppPublicSid);
BeanUtil.copyProperties(dto, finBillApplicationPublic);
finBillApplicationPublic.setSid(billAppPublicSid);
String oneBillMoney = dto.getOneBillMoney();
String sid1 = dto.getContractSid();
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid1);
CommonContractVo data = commonContractVoResultBean.getData();
String busSid = data.getBusSid();
ResultBean<BusOrderVo> 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<FinBillApplica
FinBillApplication entity = fetchBySid(sid);
FinBillApplicationDetailsVo vo = new FinBillApplicationDetailsVo();
BeanUtil.copyProperties(entity, vo);
String oneBillMoney = vo.getOneBillMoney();
if (StringUtils.isBlank(oneBillMoney)) {
String sid1 = entity.getContractSid();
ResultBean<CommonContractVo> commonContractVoResultBean = commonContractFeign.fetchBySid(sid1);
CommonContractVo data = commonContractVoResultBean.getData();
String busSid = data.getBusSid();
ResultBean<BusOrderVo> 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<FinBillVehicleVo> finBillVehicleVos = finBillVehicleService.fetchVehBySid(sid);

Loading…
Cancel
Save