发票，单据修改

src/main/java/com/glxp/api/controller/BaseController.java

@@ -39,7 +39,9 @@ public class BaseController {
 
     public String getCustomerId() {
         AuthAdmin authAdmin = getUser();
+        if (authAdmin != null)
             return authAdmin.getCustomerId() + "";
+        return "110";
     }
 
     public boolean isHosUser() {

src/main/java/com/glxp/api/controller/inout/IoOrderController.java

@@ -138,15 +138,15 @@ public class IoOrderController extends BaseController {
         }
         List<IoOrderResponse> list = orderService.getfilterList(filterOrderRequest);
         for (IoOrderResponse ioOrderResponse : list) {
-            if(ioOrderResponse.getCheckStatus() == null){
+            if (ioOrderResponse.getCheckStatus() == null) {
-                ioOrderResponse.setCheckStatus(0+"");
+                ioOrderResponse.setCheckStatus(0 + "");
             }
             FilterOrderDetailCodeRequest filterOrderDetailCodeRequest = new FilterOrderDetailCodeRequest();
             filterOrderDetailCodeRequest.setOrderIdFk(ioOrderResponse.getBillNo());
             List<IoOrderDetailCodeResponse> ioOrderDetailCodeResponses = orderDetailBizService.getfilterList(filterOrderDetailCodeRequest);
-            BigDecimal amount=new BigDecimal(0.00);
+            BigDecimal amount = new BigDecimal(0.00);
             for (IoOrderDetailCodeResponse ioOrderDetailCodeRespons : ioOrderDetailCodeResponses) {
-                if(ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice()!=null ) {
+                if (ioOrderDetailCodeRespons.getCount() != 0 && ioOrderDetailCodeRespons.getPrice() != null) {
                     amount = amount.add(new BigDecimal(ioOrderDetailCodeRespons.getCount()).multiply(ioOrderDetailCodeRespons.getPrice()));
                 }
             }
@@ -161,8 +161,6 @@ public class IoOrderController extends BaseController {
     }
 
 
-
-
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/inout/preInorder/filter")
     public BaseResponse filterPreInorder(FilterOrderRequest filterOrderRequest) {

src/main/java/com/glxp/api/controller/inout/IoOrderInvoiceController.java

@@ -8,11 +8,15 @@ import com.glxp.api.annotation.Log;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
+import com.glxp.api.dao.inout.IoOrderDetailCodeDao;
 import com.glxp.api.dao.inout.IoOrderInvoiceMapper;
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
 import com.glxp.api.http.sync.SpGetHttpClient;
 import com.glxp.api.idc.service.FileService;
 import com.glxp.api.req.inout.RefreshInoiceRequest;
+import com.glxp.api.res.inout.RefreshInoiceResponse;
+import com.glxp.api.service.inout.IoOrderDetailCodeService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
@@ -29,14 +33,21 @@ public class IoOrderInvoiceController {
     SpGetHttpClient spGetHttpClient;
     @Resource
     FileService fileService;
+    @Resource
+    IoOrderDetailCodeDao ioOrderDetailCodeDao;
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/inout/order/refrshInvoice")
     @Log(title = "发票", businessType = BusinessType.INSERT)
     public BaseResponse addBizProduct(@RequestBody RefreshInoiceRequest refreshInoiceRequest) {
-        BaseResponse baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
+        BaseResponse<RefreshInoiceResponse> baseResponse = spGetHttpClient.getIoOrderInvoices(refreshInoiceRequest);
         if (baseResponse.getCode() == 20000) {
-            List<IoOrderInvoiceEntity> orderInvoiceEntities = BeanUtil.toBean(baseResponse.getData(),List.class);
+            RefreshInoiceResponse refreshInoiceResponse = baseResponse.getData();
+
+            List<IoOrderDetailCodeEntity> orderDetailCodeEntities = refreshInoiceResponse.getOrderDetailCodeEntities();
+            ioOrderDetailCodeDao.insertOrUpdateBatch(orderDetailCodeEntities);
+
+            List<IoOrderInvoiceEntity> orderInvoiceEntities = refreshInoiceResponse.getOrderInvoiceEntities();
             if (CollUtil.isNotEmpty(orderInvoiceEntities)) {
                 List<String> syncFiles = new ArrayList<>();
                 for (IoOrderInvoiceEntity orderInvoiceEntity : orderInvoiceEntities) {

src/main/java/com/glxp/api/http/sync/SpGetHttpClient.java

@@ -21,6 +21,7 @@ import com.glxp.api.req.sync.BasicExportStatusRequest;
 import com.glxp.api.req.sync.OrderStatusFilterRequest;
 import com.glxp.api.req.sync.SyncUpLoadRequest;
 import com.glxp.api.res.PageSimpleResponse;
+import com.glxp.api.res.inout.RefreshInoiceResponse;
 import com.glxp.api.res.sync.*;
 import com.glxp.api.res.system.SyncDataSetResponse;
 import com.glxp.api.service.sync.SyncDataSetService;
@@ -140,7 +141,7 @@ public class SpGetHttpClient {
         String json = JSONUtil.toJsonStr(refreshInoiceRequest);
         String result = okHttpCli.doPostJson(getIpUrl() + "/directToSpms" + "/udiwms/inout/order/refrshInvoice", json, buildHeader());
         BaseResponse response =
-                JSONObject.parseObject(result, new TypeReference<BaseResponse>() {
+                JSONObject.parseObject(result, new TypeReference<BaseResponse<RefreshInoiceResponse>>() {
                 });
         return response;
     }

src/main/java/com/glxp/api/res/inout/RefreshInoiceResponse.java

@@ -0,0 +1,14 @@
+package com.glxp.api.res.inout;
+
+import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
+import com.glxp.api.entity.inout.IoOrderInvoiceEntity;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class RefreshInoiceResponse {
+
+    List<IoOrderInvoiceEntity> orderInvoiceEntities;
+    List<IoOrderDetailCodeEntity> orderDetailCodeEntities;
+}

src/main/resources/schemas/schema_v2.1.sql

@@ -416,3 +416,4 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'spaceOut', 'tinyint', 1);
 
 CALL Pro_Temp_ColumnWork('io_order_detail_code', 'id', 'bigint ', 2);
 CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'id', 'bigint ', 2);
+CALL Pro_Temp_ColumnWork('io_order_invoice', 'bizIdFk', 'bigint ', 2);