cps

@@ -30,6 +30,11 @@ public class DateUtil {
 		return dateToString(date, format);
 	}
 
+	public static String getDateStrNow(String format) {
+		Date date = new Date();
+		return dateToString(date, format);
+	}
+
 
 	public static String str2DateStr(String time, String preformat, String toformat) {
 		SimpleDateFormat format = new SimpleDateFormat(preformat);

@@ -724,10 +724,19 @@ public class UnionShareServiceImpl implements IUnionShareService,IBusinessExport
         UnionShareUser unionShareUser = getUnionShareUser(uid);
         if (unionShareUser != null) {
             //获取本月数据
-            result.setContent("本月订单数：100 预估佣金：¥200");
-            result.setAmount(new BigDecimal("200.01"));
-            result.setAmountStr("￥200.01");
-            result.setOrderNum(100);
+            UnionShareOrdersMonth unionShareOrdersMonth = getMonthData(uid, Integer.valueOf(DateUtil.getDateStrNow("yyyyMM")));
+            if (unionShareOrdersMonth == null) {
+                result.setContent("本月订单数：0 预估佣金：￥0");
+                result.setAmount(new BigDecimal("0"));
+                result.setAmountStr("￥0");
+                result.setOrderNum(0);
+            }else {
+                result.setAmount(unionShareOrdersMonth.getAmount());
+                DecimalFormat df = new DecimalFormat("0.00");
+                result.setAmountStr("￥"+df.format(unionShareOrdersMonth.getAmount()));
+                result.setOrderNum(unionShareOrdersMonth.getOrderNum());
+                result.setContent("本月订单数："+result.getOrderNum()+" 预估佣金："+result.getAmountStr());
+            }
             result.setStatus(1);//1-有预估数据，0-没有预估数据
         } else {
             //判断申请状态