|
@@ -114,6 +114,8 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
|
|
|
validEntityBeforeSave(add);
|
|
validEntityBeforeSave(add);
|
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
add.setCreateTime(DateUtils.getNowTime());
|
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
add.setUpdateTime(DateUtils.getNowTime());
|
|
|
|
|
+ add.setMakeOutTime(DateUtils.getNowTime());
|
|
|
|
|
+
|
|
|
boolean rs = this.save(add);
|
|
boolean rs = this.save(add);
|
|
|
if(rs){
|
|
if(rs){
|
|
|
for(int i=0;i<bo.getOrderGoodsIds().size();i++){
|
|
for(int i=0;i<bo.getOrderGoodsIds().size();i++){
|
|
@@ -153,12 +155,14 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
|
|
|
//已上传发票或有快递单号则为已开票
|
|
//已上传发票或有快递单号则为已开票
|
|
|
if(Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())){
|
|
if(Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())){
|
|
|
update.setInvoiceStatus(2);
|
|
update.setInvoiceStatus(2);
|
|
|
|
|
+ update.setApplyTime(DateUtils.getNowTime());
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
if(old.getPeriodStatus()==1&&old.getPeriodStatus()!=bo.getPeriodStatus()){
|
|
if(old.getPeriodStatus()==1&&old.getPeriodStatus()!=bo.getPeriodStatus()){
|
|
|
update.setPeriodTime(DateUtils.getNowTime());
|
|
update.setPeriodTime(DateUtils.getNowTime());
|
|
|
}
|
|
}
|
|
|
update.setUpdateTime(DateUtils.getNowTime());
|
|
update.setUpdateTime(DateUtils.getNowTime());
|
|
|
|
|
+ update.setUploadInvoice(Validator.isNotEmpty(bo.getInvoiceImg()) ? 1 : 0);
|
|
|
return this.updateById(update);
|
|
return this.updateById(update);
|
|
|
}
|
|
}
|
|
|
|
|
|