Merge branch 'refs/heads/v17.5_order_child_sync_broker_20240617' into test

performance-web/src/main/java/com/clx/performance/controller/pc/carrier/PlatformServiceFeeConfigController.java

@@ -43,6 +43,7 @@ public class PlatformServiceFeeConfigController {
 
     @ApiOperation(value = "编辑平台费率配置", notes = "<br>By:杨启发")
     @PostMapping("/updatePlatformServiceFeeConfig")
+    @UnitCovert(param = false)
     public Result updatePlatformServiceFeeConfig(@RequestBody @Validated SavePlatformServiceFeeConfigParam param) {
         platformServiceFeeConfigService.updatePlatformServiceFeeConfig(param);
         return Result.ok();

performance-web/src/main/java/com/clx/performance/sqlProvider/OrderGoodsSqlProvider.java

@@ -196,8 +196,8 @@ public class OrderGoodsSqlProvider {
                     .append(o.getGoodsId()).append("','").append(o.getCreateTime()).append("','").append(o.getModifiedTime()).append("','").append(o.getUserName()).append("','")
                     .append(o.getUserNo()).append("','").append(o.getBatchNumber()).append("','").append(o.getLastArriveReceiveTime()).append("','")
                     .append(o.getLastLoadTime()).append("','").append(o.getLastOrderTime()).append("','").append(o.getSettlementAccountPeriod()).append("','").append(o.getSettlementWay()).append("','")
-                    .append(o.getPlatformFreightQuotationTaxType()).append("','").append(o.getPlatformServiceFeeRate()).append("','").append(o.getDeposit()).append("','").append(o.getInvoiceServiceFeeRate())
-                    .append("')");
+                    .append(o.getPlatformFreightQuotationTaxType()).append("',").append(o.getPlatformServiceFeeRate()).append(",").append(o.getDeposit()).append(",").append(o.getInvoiceServiceFeeRate())
+                    .append(")");
 
             if (i < orderGoodsList.size() - 1) {
                 sqlList.append(",");