服务指令-退货流程BUG处理
This commit is contained in:
parent
0ac2e0829b
commit
400d04b349
|
|
@ -82,7 +82,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
*/
|
||||
@Override
|
||||
public Result<String> beginOrder(InvoicingOrdersEntity invoicingOrdersEntity){
|
||||
try {
|
||||
// try {
|
||||
Calendar c = Calendar.getInstance();
|
||||
InvoicingOrders entity = new InvoicingOrders();
|
||||
entity.setId(invoicingOrdersEntity.getId());
|
||||
|
|
@ -92,9 +92,9 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
entity.setUpdateTime(c.getTime());
|
||||
entity.setBizType(invoicingOrdersEntity.getFlowCode());
|
||||
baseMapper.updateOrder(entity);
|
||||
}catch (Exception e){
|
||||
return Result.error("开始失败:"+e.getMessage());
|
||||
}
|
||||
// }catch (Exception e){
|
||||
// return Result.error("开始失败:"+e.getMessage());
|
||||
// }
|
||||
return Result.ok("开始成功");
|
||||
}
|
||||
|
||||
|
|
@ -104,7 +104,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
*/
|
||||
@Override
|
||||
public Result<String> finishOrder(InvoicingOrdersEntity invoicingOrdersEntity){
|
||||
try {
|
||||
// try {
|
||||
Calendar c = Calendar.getInstance();
|
||||
QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
|
||||
ioQw.eq("id", invoicingOrdersEntity.getId());
|
||||
|
|
@ -120,9 +120,9 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
entity.setTollPrice(DirectivePrice.getTollPrice());
|
||||
entity.setComPrice(DirectivePrice.getComPrice());
|
||||
baseMapper.updateOrder(entity);
|
||||
}catch (Exception e){
|
||||
return Result.error("完成失败:"+e.getMessage());
|
||||
}
|
||||
// }catch (Exception e){
|
||||
// return Result.error("完成失败:"+e.getMessage());
|
||||
// }
|
||||
return Result.ok("完成成功");
|
||||
}
|
||||
|
||||
|
|
@ -272,17 +272,17 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
*/
|
||||
@Override
|
||||
public Result<String> flowDythCksh(InvoicingOrdersEntity invoicingOrdersEntity) {
|
||||
String code = invoicingOrdersEntity.getFlowCode();
|
||||
if(code!=null&&!code.equals("")&&code.equals("dyth_cksh")){
|
||||
try{
|
||||
// String code = invoicingOrdersEntity.getFlowCode();
|
||||
// if(code!=null&&!code.equals("")&&code.equals("dyth_cksh")){
|
||||
// try{
|
||||
thOrdersService.flowDythCksh(invoicingOrdersEntity);
|
||||
}catch (Exception e){
|
||||
return Result.error(e.getMessage());
|
||||
}
|
||||
}else {
|
||||
//返回错误信息
|
||||
return Result.error("单元退货收货流程编码错误");
|
||||
}
|
||||
// }catch (Exception e){
|
||||
// return Result.error(e.getMessage());
|
||||
// }
|
||||
// }else {
|
||||
// //返回错误信息
|
||||
// return Result.error("单元退货收货流程编码错误");
|
||||
// }
|
||||
return Result.ok();
|
||||
}
|
||||
|
||||
|
|
@ -292,7 +292,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
*/
|
||||
@Override
|
||||
public Result<String> beginDyHtOrder(InvoicingOrdersEntity invoicingOrdersEntity){
|
||||
try {
|
||||
// try {
|
||||
Calendar c = Calendar.getInstance();
|
||||
InvoicingOrders entity = new InvoicingOrders();
|
||||
entity.setPoolId(invoicingOrdersEntity.getPoolId());
|
||||
|
|
@ -302,9 +302,10 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
entity.setUpdateTime(c.getTime());
|
||||
entity.setBizType(invoicingOrdersEntity.getFlowCode());
|
||||
baseMapper.updateOrder(entity);
|
||||
}catch (Exception e){
|
||||
return Result.error("开始失败:"+e.getMessage());
|
||||
}
|
||||
// }catch (Exception e){
|
||||
// e.printStackTrace();
|
||||
// return Result.error("开始失败:"+e.getMessage());
|
||||
// }
|
||||
return Result.ok("开始成功");
|
||||
}
|
||||
|
||||
|
|
@ -314,7 +315,7 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
*/
|
||||
@Override
|
||||
public Result<String> finishDyThOrder(InvoicingOrdersEntity invoicingOrdersEntity){
|
||||
try {
|
||||
// try {
|
||||
Calendar c = Calendar.getInstance();
|
||||
QueryWrapper<InvoicingOrders> ioQw = new QueryWrapper<>();
|
||||
ioQw.eq("pool_id", invoicingOrdersEntity.getPoolId());
|
||||
|
|
@ -331,9 +332,10 @@ public class InvoicingOrdersServiceImpl extends ServiceImpl<InvoicingOrdersMappe
|
|||
entity.setTollPrice(DirectivePrice.getTollPrice());
|
||||
entity.setComPrice(DirectivePrice.getComPrice());
|
||||
baseMapper.updateOrder(entity);
|
||||
}catch (Exception e){
|
||||
return Result.error("完成失败:"+e.getMessage());
|
||||
}
|
||||
// }catch (Exception e){
|
||||
// e.printStackTrace();
|
||||
// return Result.error("完成失败:"+e.getMessage());
|
||||
// }
|
||||
return Result.ok("完成成功");
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue