Merge branch 'dev' into 'test'

Dev

See merge request jygk/dsc-base!16

base-server/pom.xml

@@ -82,6 +82,16 @@
                 </exclusion>
             </exclusions>
         </dependency>
+        <dependency>
+            <groupId>org.apache.seata</groupId>
+            <artifactId>seata-spring-boot-starter</artifactId>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.alibaba</groupId>
+                    <artifactId>druid</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
 
     </dependencies>
 

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementPageReqVO.java

@@ -35,4 +35,6 @@ public class ElementPageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
 
+    @Schema(description = "排序")
+    private Integer sort;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementRespVO.java

@@ -44,4 +44,6 @@ public class ElementRespVO {
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;
 
+    @Schema(description = "排序")
+    private Integer sort;
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/controller/admin/base/vo/ElementSaveReqVO.java

@@ -34,4 +34,7 @@ public class ElementSaveReqVO {
     @NotEmpty(message = "品位单位不能为空")
     private String gradeUnit;
 
+    @Schema(description = "排序")
+    private Integer sort;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/dataobject/base/ElementDO.java

@@ -94,4 +94,7 @@ public class ElementDO extends BusinessBaseDO {
     @TableField("UPDATER_NAME")
     private String updaterName;
 
+    @TableField("SORT")
+    private Integer sort;
+
 }

zt-module-base/zt-module-base-server/src/main/java/com/zt/plat/module/base/dal/mysql/base/ElementMapper.java

@@ -26,13 +26,14 @@ public interface ElementMapper extends BaseMapperX<ElementDO> {
                 .likeIfPresent(ElementDO::getCoding, reqVO.getCoding())
                 .eqIfPresent(ElementDO::getGradeUnit, reqVO.getGradeUnit())
                 .betweenIfPresent(ElementDO::getCreateTime, reqVO.getCreateTime())
-                .orderByDesc(ElementDO::getId));
+                .orderByDesc(ElementDO::getSort));
     }
 
     String selectMaxCode();
 
     default List<ElementDO> getElementNoPage() {
         return selectList(new LambdaQueryWrapperX<ElementDO>()
-                .orderByDesc(ElementDO::getId));
+                .eq(ElementDO::getIsEnable, 1)
+                .orderByDesc(ElementDO::getSort));
     }
 }

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/ContractApi.java

@@ -9,6 +9,7 @@ import com.zt.plat.module.contractorder.api.dto.order.PurchaseOrderWithDetailsDT
 import com.zt.plat.module.contractorder.api.dto.order.SalesOrdDtlDTO;
 import com.zt.plat.module.contractorder.api.vo.contract.international.IntContract;
 import com.zt.plat.module.contractorder.api.vo.contract.international.IntContractPageReq;
+import com.zt.plat.module.contractorder.api.vo.contract.international.IntPushContractReqVO;
 import com.zt.plat.module.contractorder.enums.ApiConstants;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -44,7 +45,7 @@ public interface ContractApi {
 
     @PostMapping(PREFIX + "/push")
     @Operation(summary = "国贸2.0系统推送合同")
-    CommonResult<Boolean> push(@Valid @RequestBody IntContract reqVO);
+    void push(@Valid @RequestBody IntPushContractReqVO pushReqVO);
 
     @GetMapping(PREFIX + "/logistics/list/page")
     @Operation(summary = "国贸2.0系统合同分页查询")

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/OrderApi.java

@@ -0,0 +1,25 @@
+package com.zt.plat.module.contractorder.api;
+
+import com.zt.plat.framework.common.pojo.CommonResult;
+import com.zt.plat.module.contractorder.api.dto.order.OrderDTO;
+import com.zt.plat.module.contractorder.enums.ApiConstants;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+
+@FeignClient(name = ApiConstants.NAME)
+@Tag(name = "RPC 服务 - 订单")
+public interface OrderApi {
+    String PREFIX = ApiConstants.PREFIX + "/order";
+    @PostMapping(PREFIX + "/order-by-order-ids")
+    @Operation(summary = "通过订单id获取订单信息", description = "通过订单编号获取订单信息")
+    CommonResult<List<OrderDTO>> getOrderByOrderIds(@RequestBody List<Long> ids);
+
+    @PostMapping(PREFIX + "/order-by-order-nos")
+    @Operation(summary = "通过订单号批量获取订单信息", description = "通过订单编号获取订单信息")
+    CommonResult<List<OrderDTO>> getOrderByOrderNos(@RequestBody List<String> orderNoS);
+}

zt-module-contract-order/zt-module-contract-order-api/src/main/java/com/zt/plat/module/contractorder/api/dto/order/OrdDtlDTO.java

@@ -99,6 +99,11 @@ public class OrdDtlDTO {
      */
     private String taxNum;
 
+    /**
+     * 税率 Y
+     */
+    private BigDecimal taxRte;
+
     // ========================== 采购订单特有属性（PrchOrdDtlDTO 独有）==========================
     /**
      * 含税单价;推送ERP（必须）
@@ -271,10 +276,6 @@ public class OrdDtlDTO {
      */
     private BigDecimal gross;
 
-    /**
-     * 税率 Y
-     */
-    private BigDecimal taxRte;
 
     /**
      * 价格条件详情;推送ERP(必须):JSON