From 1011d9d0aaab0e978caf4513b64f0a369bcd9a96 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期一, 22 七月 2019 15:39:56 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
index d5f3998..a8792c4 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/msg/MsgOrderDetailFactory.java
@@ -22,8 +22,8 @@
* @param beiZhu
* @return
*/
- public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int goodsCount, int orderState,
- BigDecimal payMoney, BigDecimal money, String beiZhu) {
+ public static MsgOrderDetail createFanLiOrder(Long uid, String orderId, int orderType, int goodsCount,
+ int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
if (uid == null)
return null;
MsgOrderDetail detail = new MsgOrderDetail();
@@ -32,6 +32,7 @@
detail.setGoodsCount(goodsCount);
detail.setHongBaoMoney(money);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setPayMoney(payMoney);
detail.setRead(false);
detail.setState(orderState);
@@ -53,8 +54,8 @@
* @param beiZhu
* @return
*/
- public static MsgOrderDetail createInviteOrder(Long uid, String orderId, int goodsCount, int orderState,
- BigDecimal payMoney, BigDecimal money, String beiZhu) {
+ public static MsgOrderDetail createInviteOrder(Long uid, String orderId, int orderType, int goodsCount,
+ int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
if (payMoney == null || money == null || uid == null)
return null;
MsgOrderDetail detail = new MsgOrderDetail();
@@ -63,6 +64,7 @@
detail.setGoodsCount(goodsCount);
detail.setHongBaoMoney(money);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setPayMoney(payMoney);
detail.setRead(false);
detail.setState(orderState);
@@ -84,8 +86,8 @@
* @param beiZhu
* @return
*/
- public static MsgOrderDetail createShareOrder(Long uid, String orderId, int goodsCount, int orderState,
- BigDecimal payMoney, BigDecimal money, String beiZhu) {
+ public static MsgOrderDetail createShareOrder(Long uid, String orderId, int orderType, int goodsCount,
+ int orderState, BigDecimal payMoney, BigDecimal money, String beiZhu) {
if (payMoney == null || money == null || uid == null)
return null;
MsgOrderDetail detail = new MsgOrderDetail();
@@ -94,6 +96,7 @@
detail.setGoodsCount(goodsCount);
detail.setHongBaoMoney(money);
detail.setOrderId(orderId);
+ detail.setOrderType(orderType);
detail.setPayMoney(payMoney);
detail.setRead(false);
detail.setState(orderState);
@@ -122,7 +125,7 @@
MsgOrderDetail detail = new MsgOrderDetail();
detail.setBeiZhu(beiZhu);
detail.setCreateTime(new Date());
- detail.setOrderId((orderType == 1 ? "銆愭窐瀹濊鍗曘��" : "") + orderId);
+ detail.setOrderType(orderType);
detail.setPayMoney(payMoney);
detail.setRead(false);
detail.setState(isSuccess ? 1 : 0);
--
Gitblit v1.8.0