上朵分销系统

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/cart/ShopSalesOrderDto.java

@@ -90,6 +90,8 @@ public class ShopSalesOrderDto implements Serializable{
 
 	private Integer salesTransportationType;	//订单运输类型  1:邮寄  2:自提
 
+	private String salesChannelAddress;	//渠道自提地点
+
 	public boolean isEfficacious() {
 		return efficacious;
 	}
@@ -353,4 +355,12 @@ public class ShopSalesOrderDto implements Serializable{
 	public void setSalesTransportationType(Integer salesTransportationType) {
 		this.salesTransportationType = salesTransportationType;
 	}
+
+	public String getSalesChannelAddress() {
+		return salesChannelAddress;
+	}
+
+	public void setSalesChannelAddress(String salesChannelAddress) {
+		this.salesChannelAddress = salesChannelAddress;
+	}
 }

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/order/Order.java

@@ -91,6 +91,7 @@ public class Order implements java.io.Serializable{
 	private Integer salesTransportationType;	//订单运输类型  1:邮寄  2:自提
 	private Integer salesChannelType;	//1:主渠道  2:子渠道
 	private Integer salesChannelId;	//渠道id
+	private String salesChannelAddress;	//渠道自提地点
 	private List<Integer> channelIds;	//渠道ids
 
 	public String getSalesAuditRemark() {
@@ -451,4 +452,12 @@ public class Order implements java.io.Serializable{
 	public void setChannelIds(List<Integer> channelIds) {
 		this.channelIds = channelIds;
 	}
+
+	public String getSalesChannelAddress() {
+		return salesChannelAddress;
+	}
+
+	public void setSalesChannelAddress(String salesChannelAddress) {
+		this.salesChannelAddress = salesChannelAddress;
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -776,6 +776,7 @@
 		AND O.SALES_STATUS !=  1
 		AND O.SALES_STATUS !=  0
 		AND O.sales_is_customized = 1
+		AND O.sales_transportation_type = 1
 		<if test="salesStatus != null and salesStatus != -1">
 			AND O.SALES_STATUS = #{salesStatus}
 		</if>
@@ -819,6 +820,7 @@
 		AND O.SALES_STATUS !=  1
 		AND O.SALES_STATUS !=  0
 		AND O.sales_is_customized = 1
+		AND O.sales_transportation_type = 1
 		<if test="salesStatus != null and salesStatus != -1">
 			AND O.SALES_STATUS = #{salesStatus}
 		</if>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/cartMapper.xml

@@ -213,8 +213,11 @@ PUBLIC
 			O.SALES_AUDIT_REMARK salesAuditRemark,
 			O.SALES_BALANCE_AMOUNT balancePayAmount,
 			O.sales_is_customized salesIsCustomized,
-			O.sales_transportation_type salesTransportationType
-		FROM 
+			O.sales_transportation_type salesTransportationType,
+			O.sales_channel_type salesChannelType,
+			O.sales_channel_id salesChannelId,
+			O.sales_channel_address salesChannelAddress
+		FROM
 			TB_IAMBERRY_SHOP_SALES_ORDER O 
 		WHERE 
 			O.SALES_ORDERID = #{0} 

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/orderMapper.xml

@@ -18,7 +18,7 @@ PUBLIC
 			 		SALES_REWARD_INTEGRAL_NUM, SALES_ADDRESS_INFO, SALES_ADDRESS_POSTNUM,
 			 		SALES_ADDRESS_TEL, SALES_ADDRESS_NAME, SALES_USER_REMARK, SALES_STATUS, 
 			 		SALES_PROXY_REWARD, SALES_REWARD_NUM,SALES_COUPON_RECEIVE_ID, Sales_balance_amount, sales_is_customized,
-			 		sales_transportation_type,sales_channel_type,sales_channel_id
+			 		sales_transportation_type,sales_channel_type,sales_channel_id,sales_channel_address
 				)
 		 VALUES 
 		  	( 
@@ -41,7 +41,7 @@ PUBLIC
 			  #{couponId},
 			  #{balancePayAmount},
 			  #{salesIsCustomized},
-			  #{salesTransportationType},#{salesChannelType},#{salesChannelId}
+			  #{salesTransportationType},#{salesChannelType},#{salesChannelId},#{salesChannelAddress}
 		  	)
 	</insert>
 	

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/order/OrderHandler.java

@@ -673,6 +673,16 @@ public class OrderHandler {
 		order.setSalesChannelType(temp.getChannelType());
 		order.setSalesTransportationType(temp.getSalesTransportationType());	//salesTransportationType	订单运输类型  1:邮寄  2:自提
 
+		if(temp.getSalesTransportationType() == 2){
+			if(temp.getChannelType() == 1){
+				MainChannel mainChannel = mainChannelService.getMainChannelById(temp.getChannelId());
+				order.setSalesChannelAddress(mainChannel.getMainChannelName());	//salesChannelAddress
+			}else if(temp.getChannelType() == 2){
+				ChildChannel childChannel = childChannelService.getChildChannelById(temp.getChannelId());
+				order.setSalesChannelAddress(childChannel.getChildChannelName());
+			}
+		}
+
 		// 保存
 		boolean flag = false;
 		try {