Merge branch 'master' into wrq_dev

tenant/insurance/quotation-summary/src/main/java/com/jzg/quotation/summary/service/impl/InsOrdersTaxServiceImpl.java

@@ -31,7 +31,18 @@ public class InsOrdersTaxServiceImpl extends ServiceImpl<InsOrdersTaxMapper, Ins
     public void createTax(InsOrders insOrders, QuoteVo quoteVo) {
         InsOrdersTax insOrdersTax = new InsOrdersTax();
         insOrdersTax.setOrderNo(insOrders.getId());
-        insOrdersTax.setTaxRelifFlag(Integer.parseInt(quoteVo.getVehicleAndVesselTaxVo().getTaxRelifFlag()));
+        Integer taxFlag = Integer.parseInt(quoteVo.getVehicleAndVesselTaxVo().getTaxRelifFlag());
+        switch(taxFlag){
+            case 1:
+                // 正常缴税赋值字段
+                insOrdersTax.setTaxpayerName(quoteVo.getVehicleAndVesselTaxVo().getTaxpayerName());
+                insOrdersTax.setTaxpayerIdentifier(quoteVo.getVehicleAndVesselTaxVo().getTaxpayerIdentifier());
+                insOrdersTax.setIdentifyNumber(quoteVo.getVehicleAndVesselTaxVo().getIdentifyNumber());
+                break;
+            default:
+                break;
+        }
+        insOrdersTax.setTaxRelifFlag(taxFlag);
         this.save(insOrdersTax);
     }