fix 合并

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsBankEditBo.java

@@ -137,4 +137,12 @@ public class GoodsBankEditBo {
 
     @ApiModelProperty("试卷试做配置列表")
     private List<GoodsExamConfigAddBo> examConfigList;
+
+    /** 服务期类型 1年 2月 3日 4区间 */
+    @ApiModelProperty("服务期类型 1年 2月 3日 4区间")
+    private Integer serviceTimeType;
+
+    /** 服务期数值 */
+    @ApiModelProperty("服务期数值")
+    private Long serviceTimeNum;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderInvoiceServiceImpl.java

@@ -114,6 +114,8 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
         validEntityBeforeSave(add);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
+        add.setMakeOutTime(DateUtils.getNowTime());
+
         boolean rs = this.save(add);
         if(rs){
             for(int i=0;i<bo.getOrderGoodsIds().size();i++){
@@ -153,15 +155,17 @@ public class OrderInvoiceServiceImpl extends ServiceImpl<OrderInvoiceMapper, Ord
             }
         }
         if(bo.getPeriodStatus()==3){
-            //已上传发票或有快递单号则为已开票
-            if(Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())){
+            //已上传发票或有快递单号且新旧数据开票状态一样则为已开票（若开票状态不一样则为人为标记开票状态不进下面逻辑）
+            if((Validator.isNotEmpty(bo.getInvoiceImg())||Validator.isNotEmpty(bo.getTrackingNum())) && (old.getInvoiceStatus().equals(bo.getInvoiceStatus()))){
                 update.setInvoiceStatus(2);
+                update.setApplyTime(DateUtils.getNowTime());
             }
         }
         if(old.getPeriodStatus()==1&&old.getPeriodStatus()!=bo.getPeriodStatus()){
             update.setPeriodTime(DateUtils.getNowTime());
         }
         update.setUpdateTime(DateUtils.getNowTime());
+        update.setUploadInvoice(Validator.isNotEmpty(bo.getInvoiceImg()) ? 1 : 0);
         return this.updateById(update);
     }