Merge branch 'dev' of http://git.yoho.cn/ufo/yohoufo-fore into dev

@@ -583,7 +583,7 @@ public class PaymentServiceImpl implements IPaymentService {
 			return;
 		}
 		record.setSystemAmount(amount);// 有货收入
-		record.setTradeStatus(0);//0:订单未完结;1:订单完结
+		record.setTradeStatus(100);
 		record.setCreateTime((int) (System.currentTimeMillis() / 1000));
 		addTradeBills(record);
     }
@@ -613,7 +613,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		}
 		record.setAmount(amount);
 		record.setSystemAmount(amount);// 有货收入
-		record.setTradeStatus(0);//0:订单未完结;1:订单完结
+		record.setTradeStatus(100);
 		record.setCreateTime((int) (System.currentTimeMillis() / 1000));
 		addTradeBills(record);
     }