Merge branch 'master' of http://git.51jingcheng.com/cys/gszc

src/main/java/com/gszc/controller/PcInvoiceController.java

@@ -58,9 +58,9 @@ public class PcInvoiceController {
             @ApiImplicitParam(name = "trackingCode", value = "快递号", required = true, dataType = "String")
     })
     @ApiOperation(value = "开票确认", notes = "开票确认")
-    public Result invoiceConfirm(String invoiceId,String trackingCompany,String trackingCode,String trackingImg) {
+    public Result invoiceConfirm(String invoiceId,String trackingCompany,String trackingCode,String invoiceImg) {
 
-        invoiceService.invoiceConfirm(invoiceId,trackingCompany,trackingCode,trackingImg);
+        invoiceService.invoiceConfirm(invoiceId,trackingCompany,trackingCode,invoiceImg);
         return ResultBuilder.success().build();
     }
 

src/main/java/com/gszc/service/impl/InvoiceServiceImpl.java

@@ -227,7 +227,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
         return jsonObject;
     }
 
-    public void invoiceConfirm(String invoiceId, String trackingCompany, String trackingCode, String trackingImg) {
+    public void invoiceConfirm(String invoiceId, String trackingCompany, String trackingCode, String invoiceImg) {
         Invoice invoice = new Invoice();
         invoice.setId(invoiceId);
         invoice.setStatusCode("enable");
@@ -235,7 +235,7 @@ public class InvoiceServiceImpl extends ServiceImpl<InvoiceMapper, Invoice> impl
 
         invoice.setTrackingCompany(trackingCompany);
         invoice.setTrackingCode(trackingCode);
-        invoice.setTrackingImg(trackingImg);
+        invoice.setInvoiceImg(invoiceImg);
         invoiceMapper.updateById(invoice);
     }