Browse Source

代码修改

anderx 6 years ago
parent
commit
3040db43eb

+ 1 - 2
src/main/java/com/goafanti/common/dao/TemporaryReceivablesMapper.java

@@ -4,6 +4,7 @@ import com.goafanti.common.model.TemporaryReceivables;
 import com.goafanti.common.model.TemporaryReceivablesExample;
 import com.goafanti.order.bo.TemporaryReceivablesBo;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
@@ -96,7 +97,5 @@ public interface TemporaryReceivablesMapper {
 	String  getCountlistReceivablesAmount(Map<String, Object> parameter);
 
 	String getCountlistReceivablesTotalAmount(Map<String, Object> parameter);
-
-
 	
 }

+ 3 - 3
src/main/java/com/goafanti/common/mapper/TemporaryReceivablesMapper.xml

@@ -424,7 +424,7 @@
 	${page_sql}
 	</if>
   </select>
-  <select id="selectReceivablesCount"  resultType="java.lang.Double">
+  <select id="selectReceivablesCount"  resultType="java.lang.Integer">
   	select count(*) from temporary_receivables a left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id
 	left join admin e on b.salesman_id=e.id 
 	where 1=1
@@ -456,7 +456,7 @@
 	and a.status= #{status}
 	</if>
   </select>
-  <select id="getCountlistReceivablesAmount" parameterType="Map" resultType="java.lang.String">
+  <select id="getCountlistReceivablesAmount" parameterType="Map" >
   select  ifnull(sum(a.amount),0) amount from temporary_receivables a left join t_order_new b on a.order_no=b.order_no 
 	left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id left join admin e on b.salesman_id=e.id 
 	where 1=1
@@ -489,7 +489,7 @@
 	</if>
 	</select>
 	
-	<select id="getCountlistReceivablesTotalAmount" parameterType="Map" resultType="java.lang.String">
+	<select id="getCountlistReceivablesTotalAmount" parameterType="Map" >
   select ifnull(sum(x.total_amount),0) from (select  b.order_no,b.total_amount  from temporary_receivables a 
   left join t_order_new b on a.order_no=b.order_no left join user c on b.buyer_id=c.id left join department d on b.order_dep=d.id 
 	left join admin e on b.salesman_id=e.id 

+ 2 - 2
src/main/java/com/goafanti/order/service/impl/OrderReceivablesServiceImpl.java

@@ -315,8 +315,8 @@ public class OrderReceivablesServiceImpl extends BaseMybatisDao<TemporaryReceiva
 		if(StringUtils.isNotBlank(TokenManager.getAdminId()))parameter.put("aid", TokenManager.getAdminId());
 		//计算回收表的订单总金额与当前总收款额。
 		Map<String,Object> map=new HashMap<String, Object>();
-		map.put("totalAmount", temporaryReceivablesMapper.getCountlistReceivablesTotalAmount(parameter));
-		map.put("amount", temporaryReceivablesMapper.getCountlistReceivablesAmount(parameter));
+		map.put("totalAmount", new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesTotalAmount(parameter)).stripTrailingZeros() );
+		map.put("amount",new BigDecimal(temporaryReceivablesMapper.getCountlistReceivablesAmount(parameter)).stripTrailingZeros() );
 		return map;
 	}