Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

# Conflicts:
#	tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/coupon/CouponItemDto.java
#	tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/couponItemMapper.xml

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

@@ -83,8 +83,8 @@ public class ShopSalesOrderDto implements Serializable{
 	private PageBean page = new PageBean();		//分页
 	
 	private boolean efficacious;							//是否存在下架商品
-	
-	
+
+	private String salesAuditRemark;		//订单备注
 
 	public boolean isEfficacious() {
 		return efficacious;
@@ -325,6 +325,12 @@ public class ShopSalesOrderDto implements Serializable{
 	public void setOrderItemList(List<ShopOrderItemDto> orderItemList) {
 		this.orderItemList = orderItemList;
 	}
-	
-	
+
+	public String getSalesAuditRemark() {
+		return salesAuditRemark;
+	}
+
+	public void setSalesAuditRemark(String salesAuditRemark) {
+		this.salesAuditRemark = salesAuditRemark;
+	}
 }

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

@@ -208,6 +208,7 @@ PUBLIC
 			O.SALES_SEND_DATE salesSendDate, O.SALES_ADDRESS_POSTNUM salesAddressPostnum,O.SALES_ADDRESS_TEL salesAddressTel, 
 			O.SALES_LOCK_TYPE salesLockType,O.SALES_COUPON_RECEIVE_ID salesCouponReceiveId,
 			O.SALES_TRANSACTION_DATE salesTransactionDate,
+			O.SALES_AUDIT_REMARK salesAuditRemark,
 			O.SALES_BALANCE_AMOUNT balancePayAmount 
 		FROM 
 			TB_IAMBERRY_SHOP_SALES_ORDER O 

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

@@ -468,8 +468,9 @@ public class OrderHandler {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "/checkOrderPaySuccess")
-	public ResultMsg checkOrderPaySuccess(
+	public ResultMsg checkOrderPaySuccess(HttpServletRequest request,
 			@RequestParam(value = "orderId") String orderId) {
+		Member member = WechatUtils.getUserBySession(request); // 当前用户
 		ResultMsg msg = new ResultMsg();
 		msg.setResultCode(ResultInfo.ERRORCODE);
 		Integer orderStatus = cartService.selectOrderStatusByOrderId(orderId);
@@ -484,7 +485,6 @@ public class OrderHandler {
 		msg.setMessage(NameUtils.getConfig("ERRORINFO"));
 		msg.setData(orderId);
 		msg.setStatus(false);
-
 		return msg;
 	}
 
@@ -495,7 +495,8 @@ public class OrderHandler {
 	 */
 	@ResponseBody
 	@RequestMapping(value = "/getOrderIntegral")
-	public ResultMsg getOrderIntegral(@RequestParam(value = "orderId") String orderId) {
+	public ResultMsg getOrderIntegral(HttpServletRequest request,@RequestParam(value = "orderId") String orderId) {
+		Member member = WechatUtils.getUserBySession(request); // 当前用户
 		ResultMsg msg = new ResultMsg();
 		msg.setResultCode(ResultInfo.ERRORCODE);
 		//Integer orderStatus = cartService.selectOrderStatusByOrderId(orderId);