上朵30元包邮处理

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

@@ -92,6 +92,8 @@ public class ShopSalesOrderDto implements Serializable{
 
 	private String salesChannelAddress;	//渠道自提地点
 
+	private Integer salesPostage;	//邮费
+
 	public boolean isEfficacious() {
 		return efficacious;
 	}
@@ -363,4 +365,12 @@ public class ShopSalesOrderDto implements Serializable{
 	public void setSalesChannelAddress(String salesChannelAddress) {
 		this.salesChannelAddress = salesChannelAddress;
 	}
+
+	public Integer getSalesPostage() {
+		return salesPostage;
+	}
+
+	public void setSalesPostage(Integer salesPostage) {
+		this.salesPostage = salesPostage;
+	}
 }

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

@@ -100,6 +100,8 @@ public class Order implements java.io.Serializable{
 
 	private String salesChannelName;	//渠道名称
 
+	private Integer salesPostage;	//邮费
+
 	public String getSalesAuditRemark() {
 		return salesAuditRemark;
 	}
@@ -475,5 +477,11 @@ public class Order implements java.io.Serializable{
 		this.salesChannelName = salesChannelName;
 	}
 
+	public Integer getSalesPostage() {
+		return salesPostage;
+	}
 
+	public void setSalesPostage(Integer salesPostage) {
+		this.salesPostage = salesPostage;
+	}
 }

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

@@ -197,7 +197,7 @@
 			O.SALES_USER_REMARK salesUserRemark, O.SALES_COLOR_TYPE salesColorType, O.SALES_ADMIN_REMARK salesAdminRemark, 
 			O.SALES_RETURN_DES salesReturnDes, O.SALES_ADDRESS_INFO salesAddressInfo, O.SALES_RETURN_DATE salesReturnDate,
 			O.SALES_AMOUNT salesAmount, O.SALES_TRANSACTION_DATE salesTransactionDate, O.SALES_OPENID salesOpenid, 
-			O.SALES_COUPON_RECEIVE_ID couponId, O.SALES_BALANCE_AMOUNT balancePayAmount, O.SALES_IS_RFUND salesIsRfund
+			O.SALES_COUPON_RECEIVE_ID couponId, O.SALES_BALANCE_AMOUNT balancePayAmount, O.SALES_IS_RFUND salesIsRfund, O.sales_postage salesPostage
 		FROM 
 			TB_IAMBERRY_SHOP_SALES_ORDER O LEFT JOIN TB_IAMBERRY_USER_USERINFO U 
 			ON O.SALES_OPENID = U.USER_OPENID 

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

@@ -216,7 +216,8 @@ PUBLIC
 			O.sales_transportation_type salesTransportationType,
 			O.sales_channel_type salesChannelType,
 			O.sales_channel_id salesChannelId,
-			O.sales_channel_address salesChannelAddress
+			O.sales_channel_address salesChannelAddress,
+			O.sales_postage salesPostage
 		FROM
 			TB_IAMBERRY_SHOP_SALES_ORDER O 
 		WHERE 

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_channel_address
+			 		sales_transportation_type,sales_channel_type,sales_channel_id,sales_channel_address,sales_postage
 				)
 		 VALUES 
 		  	( 
@@ -41,7 +41,7 @@ PUBLIC
 			  #{couponId},
 			  #{balancePayAmount},
 			  #{salesIsCustomized},
-			  #{salesTransportationType},#{salesChannelType},#{salesChannelId},#{salesChannelAddress}
+			  #{salesTransportationType},#{salesChannelType},#{salesChannelId},#{salesChannelAddress},#{salesPostage}
 		  	)
 	</insert>
 	

tooth-wechat-web/src/main/java/com/iamberry/wechat/filters/WechatFilter.java

@@ -29,8 +29,9 @@ public class WechatFilter implements Filter {
 
 	private static Logger logger = LoggerFactory.getLogger(WechatFilter.class);
 	
+	@Override
 	public void doFilter(ServletRequest request, ServletResponse response,
-			FilterChain chain) throws IOException, ServletException {
+						 FilterChain chain) throws IOException, ServletException {
 		// 权限拦截类
 		HttpServletRequest req = (HttpServletRequest) request;
 		HttpServletResponse resp = (HttpServletResponse) response;

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

@@ -653,13 +653,20 @@ public class OrderHandler {
 		}else{
 			mustPay=total;
 		}
+		Integer salesPostage = 0;
+		//当总金额小于30 的时候，不包邮，需要10块钱邮费
+		if(mustPay < 3000){
+			salesPostage = 1000;
+			mustPay = mustPay+1000;
+		}
 
-		order.setSalesYetAmount(total);
+		order.setSalesYetAmount(mustPay);
 		order.setSalesRateAmount(0);
 		order.setSalesIntegralNum(0); // 订单使用积分
 		order.setSalesCreateDate(new Date()); // 创建时间
 		order.setBalancePayAmount(0); //账户余额支付金额
 		order.setCouponId(couponId);   //优惠券id
+		order.setSalesPostage(salesPostage);	//邮费金额
 
 		order.setSalesStatus(1); // 待支付订单
 		order.setSalesTransactionDate(nowDate);  //事务时间

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/order/order.jsp

@@ -108,6 +108,15 @@
 			  	<td  class="f-14" style="font-weight: bold;">快递单号：</td>
 			  	<td>${order.salesPostNum }</td>
 			  </tr>
+				<tr class="text-r">
+					<td  class="f-14" style="font-weight: bold;">邮费：</td>
+					<td><fmt:formatNumber type="number" value="${order.salesPostage/100}" pattern="0.00" maxFractionDigits="2"/></td>
+					<td  class="f-14" style="font-weight: bold;"></td>
+					<td>
+					</td>
+					<td  class="f-14" style="font-weight: bold;"></td>
+					<td></td>
+				</tr>
 			  <tr class="text-r">
 			  	<td  class="f-14" style="font-weight: bold;">创建时间：</td>
 			  	<td><fmt:formatDate value="${order.salesCreateDate }" pattern="yyyy-MM-dd HH:mm:ss"/></td>