Merge branch 'test' into dev

hx-sale/src/main/resources/mapper/contract/ContractMapper.xml

@@ -71,16 +71,14 @@
     </select>
 
     <select id="getSalesTotal" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">
-        SELECT
-            SUM(amount) amount,
-            currency,
-            count(*) contractCount
-        FROM
-            contract
-        WHERE
-            buy_corporation_id = #{id} and status = 30 and del_flag  = 0
-        GROUP BY
-            buy_corporation_id
+        SELECT SUM(amount * rate) amount,
+               currency,
+               count(*)           contractCount
+        FROM contract
+        WHERE buy_corporation_id = #{id}
+          and status = 30
+          and del_flag = 0
+        GROUP BY buy_corporation_id
     </select>
 
     <select id="getAmount" resultType="com.fjhx.sale.entity.contract.vo.ContractVo">