爱贝源bug修改

iamberry-common-core/src/main/java/com/iamberry/wechat/tools/SendMessageUtil.java

@@ -97,12 +97,12 @@ public class SendMessageUtil {
 	 */
 	public void probationPaySuccess(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
 		String temp = ResultInfo.PROBATIONPAYSUCCESS;
-		temp = temp.replaceFirst("first", first)
-				.replaceFirst("keyword1",keyword1)
-				.replaceFirst("keyword2",keyword2)
-				.replaceFirst("keyword3",keyword3)
+		temp = temp.replaceFirst("firstValueIamberry", first)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
+				.replaceFirst("keyword3Value",keyword3)
 				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remark",remark);
+				.replaceFirst("remarkValue",remark);
 		sendTemplateMessageToOpenid(temp, openId, url,5);
 	}
 
@@ -119,12 +119,12 @@ public class SendMessageUtil {
 	 */
 	public void orderApplyRefund(String first,String keyword1,String keyword2,String keyword3,String remark,String openId,String url){
 		String temp = ResultInfo.APPLYREFUND;
-		temp = temp.replaceFirst("first", first)
-				.replaceFirst("keyword1",keyword1)
-				.replaceFirst("keyword2",keyword2)
-				.replaceFirst("keyword3",keyword3)
+		temp = temp.replaceFirst("firstValueIamberry", first)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
+				.replaceFirst("keyword3Value",keyword3)
 				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remark",remark);
+				.replaceFirst("remarkValue",remark);
 		sendTemplateMessageToOpenid(temp, openId, url,6);
 	}
 
@@ -142,13 +142,13 @@ public class SendMessageUtil {
 	 */
 	public void orderApplyReturn(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
 		String temp = ResultInfo.APPLYRETURN;
-		temp = temp.replaceFirst("first", first)
-				.replaceFirst("keyword1",keyword1)
-				.replaceFirst("keyword2",keyword2)
-				.replaceFirst("keyword3",keyword3)
-				.replaceFirst("keyword4",keyword4)
+		temp = temp.replaceFirst("firstValueIamberry", first)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
+				.replaceFirst("keyword3Value",keyword3)
+				.replaceFirst("keyword4Value",keyword4)
 				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remark",remark);
+				.replaceFirst("remarkValue",remark);
 		sendTemplateMessageToOpenid(temp, openId, url,7);
 	}
 
@@ -163,11 +163,11 @@ public class SendMessageUtil {
 	 */
 	public void orderApplyBarter(String first,String keyword1,String keyword2,String remark,String openId,String url){
 		String temp = ResultInfo.APPLYBARTER;
-		temp = temp.replaceFirst("first", first)
-				.replaceFirst("keyword1",keyword1)
-				.replaceFirst("keyword2",keyword2)
+		temp = temp.replaceFirst("firstValueIamberry", first)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
 				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remark",remark);
+				.replaceFirst("remarkValue",remark);
 		sendTemplateMessageToOpenid(temp, openId, url,8);
 	}
 
@@ -184,13 +184,13 @@ public class SendMessageUtil {
 	 */
 	public void orderSendSuccess(String first,String keyword1,String keyword2,String keyword3,String keyword4,String remark,String openId,String url){
 		String temp = ResultInfo.SENDSUCCESS;
-		temp = temp.replaceFirst("first", first)
-				.replaceFirst("keyword1",keyword1)
-				.replaceFirst("keyword2",keyword2)
-				.replaceFirst("keyword3",keyword3)
-				.replaceFirst("keyword4",keyword4)
+		temp = temp.replaceFirst("firstValueIamberry", first)
+				.replaceFirst("keyword1Value",keyword1)
+				.replaceFirst("keyword2Value",keyword2)
+				.replaceFirst("keyword3Value",keyword3)
+				.replaceFirst("keyword4Value",keyword4)
 				.replaceFirst("colorValue","#1C86EE")
-				.replaceFirst("remark",remark);
+				.replaceFirst("remarkValue",remark);
 		sendTemplateMessageToOpenid(temp, openId, url,9);
 	}
 

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

@@ -213,7 +213,7 @@ PUBLIC
 			I.ITEM_PRODUCT_DISCOUNT itemProductDiscount, I.ITEM_PRODUCT_PRICE itemProductPrice,
 			I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_NUM itemNum, I.ITEM_TOTAL itemTotal,
 			P.PRODUCT_DISCOUNT productDiscount,P. PRODUCT_PRICE productPrice,
-			P.PRODUCT_STATUS productStatus,I.ITEM_PRODUCT_ID itemProductId,I.item_product_color itemProductColor
+			P.PRODUCT_STATUS productStatus,I.ITEM_PRODUCT_ID itemProductId,I.item_product_color itemProductColor,I.item_gift_source itemGiftSource
 		FROM 
 			TB_IAMBERRY_SHOP_ORDER_ITEM I
 		LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/cart/CartHandlers.java

@@ -52,40 +52,40 @@ import com.iamberry.wechat.handles.mq.MQServiceProxy;
 @Controller
 @RequestMapping("/wechat/cart")
 public class CartHandlers {
-	
+
 	@Autowired
 	private CartService cartService;
-	
+
 	@Autowired
 	private WechatUtils wechatUtils;
-	
+
 	@Autowired
 	private HomeService homeService;
-	
+
 	@Autowired
 	private SystemService systemService;
-	
+
 	@Autowired
 	private ValidatorUtil validatorUtil;
-	
+
 	@Autowired
 	private AdminOrderService adminOrderService;
-	
+
 	@Autowired
 	private PayService payService;
-	
+
 	@Autowired
 	private MQServiceProxy mQservice;
 
 	@Autowired
 	private MemberService memberService;
-	
+
 	@Autowired
 	private CouponItemService couponItemService;
 
 	@Autowired
 	private ProductInfoService productInfoService;
-	
+
 	/**
 	 * 进入购物车页面
 	 * @param request
@@ -120,14 +120,14 @@ public class CartHandlers {
 		map.put("isShow", ResultInfo.ISSHOW);
 		map.put("cartDesc", ResultInfo.CARTDESC);
 		map.put("cart_url", ResultInfo.CART_URL);
-		
+
 		remsg.setMessage(ResultInfo.SUCCESSINFO);
 		remsg.setResultCode(ResultInfo.SUCCESSCODE);
 		remsg.setStatus(true);
 		remsg.setData(map);
 		return remsg;
 	}
-	
+
 	/**
 	 * 获取购物车数量
 	 * @param request
@@ -155,7 +155,7 @@ public class CartHandlers {
 		remsg.setData(cartNum);
 		return remsg;
 	}
-	
+
 	/**
 	 * 首页添加商品到购物车
 	 * @param cartNum
@@ -172,7 +172,7 @@ public class CartHandlers {
 		String openId  = wechatUtils.getUserBySession(request).getUserOpenid();
 		CartDto cartDto = new CartDto();
 		ResultMsg remsg=new ResultMsg();
-		
+
 		Integer cid = 0;
 		if (productColorId != null && !"".equals(productColorId) && !"null".equals(productColorId) && StaticInfo.pattern.matcher(productColorId).find()) {
 			cid = Integer.parseInt(productColorId);
@@ -218,7 +218,7 @@ public class CartHandlers {
 		}
 		return remsg;
 	}
-	
+
 	/**
 	 * 	点击加号按钮添加商品到购物车
 	 * @param request
@@ -261,7 +261,7 @@ public class CartHandlers {
 		}
 		return remsg;
 	}
-	
+
 	/**
 	 * 	点击减号按钮删除商品
 	 * @param request
@@ -304,7 +304,7 @@ public class CartHandlers {
 		}
 		return remsg;
 	}
-	
+
 	/**
 	 * 点击垃圾桶按钮删除购物车物品信息
 	 * @param request
@@ -333,9 +333,9 @@ public class CartHandlers {
 		}
 		return remsg;
 	}
-	
+
 	/**
-	 * 
+	 *
 	 * 查询订单列表页面
 	 * @param request
 	 * @param pageSize
@@ -348,7 +348,7 @@ public class CartHandlers {
 	@ResponseBody
 	@RequestMapping(value = "/selectShopOrder")
 	public  ResultMsg selectShopOrder(HttpServletRequest request,
-			@RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize, 
+			@RequestParam(value= "pageSize",defaultValue= "10" ,required=false) Integer pageSize,
 			@RequestParam(value = "pageNO", defaultValue = "1") Integer pageNO,
 			@RequestParam(value = "salesStatus",defaultValue = "")String salesStatus,
 			@RequestParam(value = "text",defaultValue = "")String text) throws Exception {
@@ -369,7 +369,7 @@ public class CartHandlers {
 		bean.setText(openId);
 		bean.setPaperData(pageNO, pageSize);
 		List<ShopOrderAndItemDto> shopOrderList = cartService.selectShopOrder(bean);
-		
+
 		//查询订单列表时同步百胜信息
 		if (null != shopOrderList && shopOrderList.size() > 0) {
 
@@ -387,7 +387,7 @@ public class CartHandlers {
 				//将所有赠品筛选出来
 				while (it.hasNext()) {
 					OrderItem item = (OrderItem)it.next();
-					if (item.getItemProductDiscount() == 0) {
+					if (item.getItemGiftSource() != null && !"".equals(item.getItemGiftSource())) {
 						SalesUserGift gift = new SalesUserGift();
 						gift.setGiftName(item.getItemProductName());
 						gift.setGiftColorName(item.getItemProductColor());
@@ -444,8 +444,8 @@ public class CartHandlers {
 		remsg.setData(map);
 		return remsg;
 	}
-	
-	
+
+
 	/**
 	 * 查询订单详情
 	 * @param request
@@ -562,8 +562,8 @@ public class CartHandlers {
 		remsg.setStatus(true);
 		return remsg;
 	}
-	
-	
+
+
 	/**
 	 * 订单页面支付方法
 	 * @param request
@@ -587,7 +587,7 @@ public class CartHandlers {
 			shopSalesOrderDto = cartService.getShopOrderByOrderId(orderId, openId);
 			orderItemList = cartService.selectShopOrderItem(orderId);
 			Member member = memberService.getMemberByUserOpenId(openId);
-			
+
 			//获取账户余额，判断是否在可用范围内
 			///int balancePayAmount=shopSalesOrderDto.getBalancePayAmount();
 			int total = shopSalesOrderDto.getSalesYetAmount();
@@ -615,10 +615,10 @@ public class CartHandlers {
 		msg.setMessage(ResultInfo.SUCCESSINFO);
 		msg.setData(dto);
 		msg.setStatus(true);
-		
+
 		return msg;
 	}
-	
+
 	/**
 	 * 	取消订单
 	 * @param request
@@ -629,7 +629,7 @@ public class CartHandlers {
 	@ResponseBody
 	@RequestMapping("/cancelOrder")
 	public ResultMsg cancelOrder(HttpServletRequest request,
-			@RequestParam(value = "orderId",defaultValue = "")String orderId, 
+			@RequestParam(value = "orderId",defaultValue = "")String orderId,
 			@RequestParam(value = "status",defaultValue = "-1") Integer status)  throws Exception{
 		String openId  = wechatUtils.getUserBySession(request).getUserOpenid();
 		ResultMsg remsg=new ResultMsg();
@@ -678,8 +678,8 @@ public class CartHandlers {
 			return remsg;
 		}
 	}
-	
-	
+
+
 	/**
 	 * 	订单退货或退款
 	 * @param request
@@ -761,7 +761,7 @@ public class CartHandlers {
 						}
 					}
 				}
-				
+
 			} else {
 				remsg.setMessage(ResultInfo.ERRORINFO);
 				remsg.setResultCode(ResultInfo.ERRORCODE);
@@ -771,7 +771,7 @@ public class CartHandlers {
 		}
 		return remsg;
 	}
-	
+
 	/**
 	 * 订单换货
 	 * @param request
@@ -780,12 +780,12 @@ public class CartHandlers {
 	 */
 	@ResponseBody
 	@RequestMapping("/exchangeOrder")
-	public ResultMsg exchangeOrder(HttpServletRequest request, 
-			@RequestParam(value = "orderId",defaultValue = "")String orderId, 
+	public ResultMsg exchangeOrder(HttpServletRequest request,
+			@RequestParam(value = "orderId",defaultValue = "")String orderId,
 			@RequestParam(value = "status",defaultValue = "-1") Integer status,
 			@RequestParam(value = "changeOrderId",defaultValue = "") String changeOrderId) throws Exception{
 		ResultMsg remsg=new ResultMsg();
-		
+
 		String openId  = wechatUtils.getUserBySession(request).getUserOpenid();
 		Order order = new Order();
 		order.setSalesOrderid(orderId);

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

@@ -516,7 +516,6 @@ public class OrderHandler {
 			} catch (Exception e) {
 				// TODO: handle exception
 			}
-			
 		}
 		
 		msg.setResultCode(ResultInfo.SUCCESSCODE);