소스 검색

格式调整

zxf 4 주 전
부모
커밋
6e643bde2e

+ 1 - 1
jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/RptFinancialMonthSummaryServiceImpl.java

@@ -193,7 +193,7 @@ public class RptFinancialMonthSummaryServiceImpl implements IRptFinancialMonthSu
             else{
              //这个供应商该产品下  没配置
                 logger.info("该供应商未配置该产品折扣信息 - 供应商id: {}, 物流公司: {}, 产品类型: {}",currentDeptId,orderType.equals("1")?"京东":"顺丰",productCode);
-                rateParam.put("rate",10);
+                rateParam.put("rate",10.00);
                 bizWaybillOrderMapper.updateRateByMonthAndDept(rateParam);
             }
         }

+ 1 - 2
jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizWaybillCostDetailsMapper.xml

@@ -55,8 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.fee_item_name,
             a.amount,
             ifnull( a.adjust_amount, a.rate_amount ) rate_amount,
-            a.amount,
-            ifnull(a.rate,'--') rate,
+            ifnull(TRIM(TRAILING '.' FROM TRIM(TRAILING '0' FROM rate)),'--') rate,
             a.purchase_amount,
             DATE_FORMAT( b.sign_time, '%Y.%m' )  summaryMonth,
             a.remark,