|
@@ -31,6 +31,9 @@ import vip.xiaonuo.biz.modular.bizauditlog.entity.BizAuditLog;
|
|
import vip.xiaonuo.biz.modular.bizauditlog.service.BizAuditLogService;
|
|
import vip.xiaonuo.biz.modular.bizauditlog.service.BizAuditLogService;
|
|
import vip.xiaonuo.biz.modular.bizconfig.entity.BizConfig;
|
|
import vip.xiaonuo.biz.modular.bizconfig.entity.BizConfig;
|
|
import vip.xiaonuo.biz.modular.bizconfig.service.BizConfigService;
|
|
import vip.xiaonuo.biz.modular.bizconfig.service.BizConfigService;
|
|
|
|
+import vip.xiaonuo.biz.modular.bizloadarrive.entity.BizLoadArrive;
|
|
|
|
+import vip.xiaonuo.biz.modular.bizloadarrive.param.BizLoadArrivePageParam;
|
|
|
|
+import vip.xiaonuo.biz.modular.bizloadarrive.service.BizLoadArriveService;
|
|
import vip.xiaonuo.biz.modular.bizorder.entity.BizOrder;
|
|
import vip.xiaonuo.biz.modular.bizorder.entity.BizOrder;
|
|
import vip.xiaonuo.biz.modular.bizorder.param.BizOrderPageParam;
|
|
import vip.xiaonuo.biz.modular.bizorder.param.BizOrderPageParam;
|
|
import vip.xiaonuo.biz.modular.bizorder.service.BizOrderService;
|
|
import vip.xiaonuo.biz.modular.bizorder.service.BizOrderService;
|
|
@@ -71,6 +74,8 @@ public class BizSettleServiceImpl extends ServiceImpl<BizSettleMapper, BizSettle
|
|
private BizAuditLogService bizAuditLogService;
|
|
private BizAuditLogService bizAuditLogService;
|
|
@Resource
|
|
@Resource
|
|
private BizOrderSupplierService bizOrderSupplierService;
|
|
private BizOrderSupplierService bizOrderSupplierService;
|
|
|
|
+ @Resource
|
|
|
|
+ private BizLoadArriveService bizLoadArriveService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Page<BizSettle> page(BizSettlePageParam bizSettlePageParam) {
|
|
public Page<BizSettle> page(BizSettlePageParam bizSettlePageParam) {
|
|
@@ -106,12 +111,7 @@ public class BizSettleServiceImpl extends ServiceImpl<BizSettleMapper, BizSettle
|
|
@Override
|
|
@Override
|
|
public void add(BizSettleAddParam bizSettleAddParam) {
|
|
public void add(BizSettleAddParam bizSettleAddParam) {
|
|
|
|
|
|
- if(ObjectUtil.isNotEmpty(bizSettleAddParam.getSettleAccount())){
|
|
|
|
- BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
|
|
|
|
- if(bizSettleAddParam.getSettleAccount().compareTo(bizConfig.getSettleAccount()) < 0){
|
|
|
|
- throw new CommonException("结算基础金额为{},低于该金额不可结算!",bizConfig.getSettleAccount());
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
|
|
+ checkParam(bizSettleAddParam);
|
|
|
|
|
|
BizSettle bizSettle = BeanUtil.toBean(bizSettleAddParam, BizSettle.class);
|
|
BizSettle bizSettle = BeanUtil.toBean(bizSettleAddParam, BizSettle.class);
|
|
String settleNo = getNumber();
|
|
String settleNo = getNumber();
|
|
@@ -134,11 +134,21 @@ public class BizSettleServiceImpl extends ServiceImpl<BizSettleMapper, BizSettle
|
|
last("limit 1"));
|
|
last("limit 1"));
|
|
if(ObjectUtil.isNotNull(orderSupplier)){
|
|
if(ObjectUtil.isNotNull(orderSupplier)){
|
|
//修改订单状态:待结算->已结算
|
|
//修改订单状态:待结算->已结算
|
|
- /*updateWrapper.set("order_status","9").eq("id",bizOrder.getId());
|
|
|
|
- bizOrderService.update(updateWrapper);*/
|
|
|
|
|
|
+ /*updateWrapper.set("order_status","9").eq("id",bizOrder.getId());
|
|
|
|
+ bizOrderService.update(updateWrapper);*/
|
|
orderSupplier.setStatus("1");
|
|
orderSupplier.setStatus("1");
|
|
bizOrderSupplierService.updateById(orderSupplier);
|
|
bizOrderSupplierService.updateById(orderSupplier);
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void checkParam(BizSettleAddParam bizSettleAddParam){
|
|
|
|
+ if(ObjectUtil.isNotEmpty(bizSettleAddParam.getSettleAccount())){
|
|
|
|
+ BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
|
|
|
|
+ if(bizSettleAddParam.getSettleAccount().compareTo(bizConfig.getSettleAccount()) < 0){
|
|
|
|
+ throw new CommonException("结算基础金额为{},低于该金额不可结算!",bizConfig.getSettleAccount());
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -224,6 +234,81 @@ public class BizSettleServiceImpl extends ServiceImpl<BizSettleMapper, BizSettle
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ @Override
|
|
|
|
+ public void addShipSettle(BizSettleAddParam bizSettleAddParam) {
|
|
|
|
+ checkParam(bizSettleAddParam);
|
|
|
|
+
|
|
|
|
+ BizSettle bizSettle = BeanUtil.toBean(bizSettleAddParam, BizSettle.class);
|
|
|
|
+ String settleNo = getNumber();
|
|
|
|
+ bizSettle.setSettleNo(settleNo);
|
|
|
|
+ this.save(bizSettle);
|
|
|
|
+
|
|
|
|
+ if(ObjectUtil.isNotEmpty(bizSettleAddParam.getArriveList())){
|
|
|
|
+ for(BizLoadArrive bizLoadArrive : bizSettleAddParam.getArriveList()){
|
|
|
|
+ //新增数据关联表
|
|
|
|
+ BizSettleOrder bizSettleOrder = new BizSettleOrder();
|
|
|
|
+ bizSettleOrder.setSettleId(bizSettle.getId());
|
|
|
|
+ bizSettleOrder.setOrderId(bizLoadArrive.getId());
|
|
|
|
+ bizSettleOrderService.save(bizSettleOrder);
|
|
|
|
+
|
|
|
|
+ //修改报港预约状态
|
|
|
|
+ BizLoadArrive loadArrive = bizLoadArriveService.getById(bizLoadArrive.getId());
|
|
|
|
+ loadArrive.setStatus("5");
|
|
|
|
+ bizLoadArriveService.updateById(loadArrive);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ @Override
|
|
|
|
+ public void editShipSettle(BizSettleEditParam bizSettleEditParam) {
|
|
|
|
+ checkParam(bizSettleEditParam);
|
|
|
|
+
|
|
|
|
+ BizSettle bizSettle = this.queryEntity(bizSettleEditParam.getId());
|
|
|
|
+ BeanUtil.copyProperties(bizSettleEditParam, bizSettle);
|
|
|
|
+ if(StringUtils.equals(bizSettle.getSettleStatus(),"3")){
|
|
|
|
+ bizSettle.setSettleStatus("2");
|
|
|
|
+ }
|
|
|
|
+ this.updateById(bizSettle);
|
|
|
|
+
|
|
|
|
+ //删除之前关联信息
|
|
|
|
+ List<BizSettleOrder> list = bizSettleOrderService.list(new QueryWrapper<BizSettleOrder>().lambda().
|
|
|
|
+ eq(BizSettleOrder::getSettleId, bizSettle.getId()));
|
|
|
|
+ //修改订单状态
|
|
|
|
+ for(BizSettleOrder bizSettleOrder: list){
|
|
|
|
+ BizLoadArrive loadArrive = bizLoadArriveService.getById(bizSettleOrder.getOrderId());
|
|
|
|
+ loadArrive.setStatus("4");
|
|
|
|
+ bizLoadArriveService.updateById(loadArrive);
|
|
|
|
+ }
|
|
|
|
+ //删除关联信息表
|
|
|
|
+ bizSettleOrderService.removeByIds(CollStreamUtil.toList(list,BizSettleOrder::getId));
|
|
|
|
+
|
|
|
|
+ //新增新的关联信息
|
|
|
|
+ if(ObjectUtil.isNotEmpty(bizSettleEditParam.getArriveList())){
|
|
|
|
+ for(BizLoadArrive bizLoadArrive : bizSettleEditParam.getArriveList()){
|
|
|
|
+ //新增数据关联表
|
|
|
|
+ BizSettleOrder bizSettleOrder = new BizSettleOrder();
|
|
|
|
+ bizSettleOrder.setSettleId(bizSettle.getId());
|
|
|
|
+ bizSettleOrder.setOrderId(bizLoadArrive.getId());
|
|
|
|
+ bizSettleOrderService.save(bizSettleOrder);
|
|
|
|
+
|
|
|
|
+ BizLoadArrive loadArrive = bizLoadArriveService.getById(bizLoadArrive.getId());
|
|
|
|
+ loadArrive.setStatus("5");
|
|
|
|
+ bizLoadArriveService.updateById(loadArrive);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public void checkParam(BizSettleEditParam bizSettleEditParam){
|
|
|
|
+ if(ObjectUtil.isNotEmpty(bizSettleEditParam.getSettleAccount())){
|
|
|
|
+ BizConfig bizConfig = bizConfigService.getOne(new QueryWrapper<BizConfig>().lambda().last("limit 1"));
|
|
|
|
+ if(bizSettleEditParam.getSettleAccount().compareTo(bizConfig.getSettleAccount()) < 0){
|
|
|
|
+ throw new CommonException("结算基础金额为{},低于该金额不可结算!",bizConfig.getSettleAccount());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Override
|
|
@Override
|
|
public void delete(List<BizSettleIdParam> bizSettleIdParamList) {
|
|
public void delete(List<BizSettleIdParam> bizSettleIdParamList) {
|
|
@@ -253,6 +338,29 @@ public class BizSettleServiceImpl extends ServiceImpl<BizSettleMapper, BizSettle
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ @Override
|
|
|
|
+ public void deleteArrive(List<BizSettleIdParam> bizSettleIdParamList) {
|
|
|
|
+ for(BizSettleIdParam bizSettleIdParam : bizSettleIdParamList){
|
|
|
|
+ //删除关联表信息
|
|
|
|
+ List<BizSettleOrder> list = bizSettleOrderService.list(new QueryWrapper<BizSettleOrder>().lambda().
|
|
|
|
+ eq(BizSettleOrder::getSettleId, bizSettleIdParam.getId()));
|
|
|
|
+ //修改订单状态
|
|
|
|
+ for(BizSettleOrder bizSettleOrder: list){
|
|
|
|
+ BizLoadArrive loadArrive = bizLoadArriveService.getById(bizSettleOrder.getOrderId());
|
|
|
|
+ loadArrive.setStatus("4");
|
|
|
|
+ bizLoadArriveService.updateById(loadArrive);
|
|
|
|
+
|
|
|
|
+ }
|
|
|
|
+ //删除关联信息表
|
|
|
|
+ bizSettleOrderService.removeByIds(CollStreamUtil.toList(list,BizSettleOrder::getId));
|
|
|
|
+
|
|
|
|
+
|
|
|
|
+ //删除运费结算信息
|
|
|
|
+ this.removeById(bizSettleIdParam.getId());
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public BizSettle detail(BizSettleIdParam bizSettleIdParam) {
|
|
public BizSettle detail(BizSettleIdParam bizSettleIdParam) {
|
|
return this.queryEntity(bizSettleIdParam.getId());
|
|
return this.queryEntity(bizSettleIdParam.getId());
|
|
@@ -286,6 +394,24 @@ public class BizSettleServiceImpl extends ServiceImpl<BizSettleMapper, BizSettle
|
|
return bizSettle;
|
|
return bizSettle;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
+ public BizSettle detailArrive(BizSettleIdParam bizSettleIdParam) {
|
|
|
|
+ BizSettle bizSettle = this.queryEntity(bizSettleIdParam.getId());
|
|
|
|
+ List<BizSettleOrder> list = bizSettleOrderService.list(new QueryWrapper<BizSettleOrder>().lambda().
|
|
|
|
+ eq(BizSettleOrder::getSettleId, bizSettleIdParam.getId()));
|
|
|
|
+ List<BizLoadArrive> arriveList = Lists.newArrayList();
|
|
|
|
+ for(BizSettleOrder bizSettleOrder : list){
|
|
|
|
+ BizLoadArrivePageParam bizLoadArrivePageParam = new BizLoadArrivePageParam();
|
|
|
|
+ bizLoadArrivePageParam.setId(bizSettleOrder.getOrderId());
|
|
|
|
+ List<BizLoadArrive> detailOrder = bizLoadArriveService.getList(bizLoadArrivePageParam);
|
|
|
|
+ for(BizLoadArrive bizLoadArrive : detailOrder){
|
|
|
|
+ arriveList.add(bizLoadArrive);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
|
|
+ bizSettle.setArriveList(arriveList);
|
|
|
|
+ return bizSettle;
|
|
|
|
+ }
|
|
|
|
+
|
|
@Override
|
|
@Override
|
|
public void submit(BizSettleEditParam bizSettleEditParam) {
|
|
public void submit(BizSettleEditParam bizSettleEditParam) {
|
|
BizSettle bizSettle = this.queryEntity(bizSettleEditParam.getId());
|
|
BizSettle bizSettle = this.queryEntity(bizSettleEditParam.getId());
|