爱贝源bug修改

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

@@ -33,6 +33,8 @@ public class CartDto implements Serializable{
 	private Integer productPrice;		//商品原价
 	
 	private Integer productStatus;		//商品状态
+
+	private Integer colorStatus;		//颜色状态
 	
 	private String productIntroduceImg;	//介绍图
 	
@@ -44,6 +46,8 @@ public class CartDto implements Serializable{
 	
 	private String productColor;			//产品颜色		不再用代码表示，直接使用汉字- 1：红色	2：橙色	3：黄色	4：绿色 5：青色	6：蓝色	7：紫色	8：白色
 
+	private Integer productType;	//产品类型
+
 	private Integer productChildType;	//产品类型
 
 	private Integer cartColorId;//产品颜色id
@@ -188,4 +192,20 @@ public class CartDto implements Serializable{
 	public void setSalesUserGiftList(List<SalesUserGift> salesUserGiftList) {
 		this.salesUserGiftList = salesUserGiftList;
 	}
+
+	public Integer getProductType() {
+		return productType;
+	}
+
+	public void setProductType(Integer productType) {
+		this.productType = productType;
+	}
+
+	public Integer getColorStatus() {
+		return colorStatus;
+	}
+
+	public void setColorStatus(Integer colorStatus) {
+		this.colorStatus = colorStatus;
+	}
 }

iamberry-common-tool/src/main/java/com/iamberry/wechat/tools/loadResultUtil.java

@@ -96,7 +96,9 @@ public class loadResultUtil {
 			
 			//购物车活动字段
 			ResultInfo.ISSHOW="是";
-			ResultInfo.CARTDESC="京东众筹价¥399，快快点我前往！";
+//			ResultInfo.CARTDESC="京东众筹价¥399，快快点我前往！";
+			ResultInfo.CARTDESC="";
+
 			ResultInfo.CART_URL="http://z.jd.com/project/details/53631.html?from=jr_search&type=0";
 			
 			ResultInfo.getMoneyLimitDown=100;

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

@@ -14,6 +14,7 @@ PUBLIC
 			C.CART_ID,
 			C.CART_PRODUCT_ID,
 			C.CART_NUM,
+			pc.color_status,
 			P.PRODUCT_NAME,
 			pc.color_discount,
 			P.PRODUCT_STATUS,
@@ -37,6 +38,7 @@ PUBLIC
 		<result column="product_name" property="productName"/>
 		<result column="color_discount" property="productPrice"/>
 		<result column="product_status" property="productStatus"/>
+		<result column="color_status" property="colorStatus"/>
 		<result column="color_name" property="productColor"/>
 		<result column="product_introduce_img" property="productIntroduceImg"/>
 		<result column="product_remark" property="productRemark"/>
@@ -307,7 +309,7 @@ PUBLIC
 			C.CART_ID cartId, G.PRODUCT_ID cartProductId, pc.COLOR_ID cartColorId, G.PRODUCT_STATUS productStatus,
 			C.CART_NUM cartNum, G.PRODUCT_NAME productName, pc.COLOR_DISCOUNT productPrice,
 			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, pc.COLOR_PRICE productDiscount, PC.COLOR_69CODE productRemark,
-			pc.COLOR_NAME productColor, G.PRODUCT_CHILD_TYPE productChildType,C.cart_is_source cartIsSource
+			pc.COLOR_NAME productColor, G.PRODUCT_CHILD_TYPE productChildType, G.PRODUCT_TYPE productType,C.cart_is_source cartIsSource
 		FROM
 			TB_IAMBERRY_SHOP_CART C
 		LEFT JOIN TB_IAMBERRY_PRODUCT_INFO G ON C.CART_PRODUCT_ID = G.PRODUCT_ID

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

@@ -289,15 +289,18 @@ public class CartHandlers {
 			num = cartService.updateCartByOpenId(cartDto);
 		} else {
 			this.deleteCartByProductId(request,productColorId,cartIsSource);
+			num = 1;
 		}
 		if (num > 0) {
 			remsg.setMessage(ResultInfo.SUCCESSINFO);
 			remsg.setResultCode(ResultInfo.SUCCESSCODE);
 			remsg.setStatus(true);
+			remsg.setData("");
 		} else {
 			remsg.setMessage(ResultInfo.ERRORINFO);
 			remsg.setResultCode(ResultInfo.ERRORCODE);
 			remsg.setStatus(false);
+			remsg.setData("");
 		}
 		return remsg;
 	}
@@ -586,15 +589,15 @@ public class CartHandlers {
 			Member member = memberService.getMemberByUserOpenId(openId);
 			
 			//获取账户余额，判断是否在可用范围内
-			int balancePayAmount=shopSalesOrderDto.getBalancePayAmount();
+			///int balancePayAmount=shopSalesOrderDto.getBalancePayAmount();
 			int total = shopSalesOrderDto.getSalesYetAmount();
 			//判断余额支付金额是否大于用户余额
-			if(balancePayAmount>0 && member.getUserIncome()>balancePayAmount){
-				total = total - balancePayAmount > 0 ? total - balancePayAmount : 0;
-			}else if(balancePayAmount>0 && member.getUserIncome()<balancePayAmount){
-				msg.setMessage(ResultInfo.NO_ENOUGH_FOR_PAY);
-				return msg;
-			}
+//			if(balancePayAmount>0 && member.getUserIncome()>balancePayAmount){
+//				total = total - balancePayAmount > 0 ? total - balancePayAmount : 0;
+//			}else if(balancePayAmount>0 && member.getUserIncome()<balancePayAmount){
+//				msg.setMessage(ResultInfo.NO_ENOUGH_FOR_PAY);
+//				return msg;
+//			}
 			// 发起支付
 			PayResult result = payService.requestPay(openId, orderId, total, orderItemList.get(0).getItemProductName() + "...", NameUtils.WECHAT_ORDER_BACK);
 			if (result.isPaySuccess()) {

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

@@ -181,8 +181,7 @@ public class ProductInfoHandler {
 	 */
 	@ResponseBody
 	@RequestMapping("/getProductByProductId")
-	public ResultMsg getProductByProductId(HttpServletRequest request,HttpServletResponse response,
-			@RequestParam(value = "productId",defaultValue = "") String productId) throws Exception {
+	public ResultMsg getProductByProductId(HttpServletRequest request,HttpServletResponse response,String productId) throws Exception {
 
 		ResultMsg remsg = new ResultMsg();
 		Member member =  wechatUtils.getUserBySession(request);
@@ -196,7 +195,7 @@ public class ProductInfoHandler {
 			remsg.setMessage(ResultInfo.loginOutError);
 			return remsg;
 		}
-		if (productId == null) {
+		if (productId == null || "".equals(productId)) {
 			remsg.setStatus(false);
 			remsg.setResultCode(ResultInfo.ERRORCODE);
 			remsg.setMessage(ResultInfo.ERRORINFO);

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

@@ -94,7 +94,7 @@ public class OrderHandler {
 	private MQServiceProxy mQservice;
 	@Autowired
 	private ProductInfoService productInfoService;
-	
+
 	/**
 	 * 支付前，调用方法
 	 * @param request
@@ -318,6 +318,8 @@ public class OrderHandler {
 				item.setItemProductColor(cartDto.getProductColor());
 				item.setItemProductChildType(cartDto.getProductChildType());
 				item.setItemIsSource(cartDto.getCartIsSource());
+				item.setItemProductType(cartDto.getProductType());
+				item.setItemProductChildType(cartDto.getProductChildType());
 				list.add(item);
 			}
 			//查询产品赠品信息
@@ -338,6 +340,8 @@ public class OrderHandler {
 					item.setItemProductChildType(gift.getGiftChildType());
 					item.setItemIsSource(1);
 					item.setItemGiftSource(cartDto.getCartColorId());
+					item.setItemProductType(cartDto.getProductType());
+					item.setItemProductChildType(cartDto.getProductChildType());
 					list.add(item);
 				}
 			}
@@ -398,15 +402,13 @@ public class OrderHandler {
 		}
 		
 		//获取账户余额，判断是否在可用范围内
-		int balancePayAmount=temp.getBalancePayAmount();
-		if(balancePayAmount>0 && member.getUserIncome()>balancePayAmount){
-			mustPay=total-temp.getBalancePayAmount()>0?total-temp.getBalancePayAmount():0;
-		}else if(balancePayAmount>0 && member.getUserIncome()<balancePayAmount){
-			msg.setMessage(ResultInfo.NO_ENOUGH_FOR_PAY);
-			return msg;
-		}
-		
-//System.out.println("====mustPay===="+mustPay+"totalMoney======"+total);
+//		int balancePayAmount=temp.getBalancePayAmount();
+//		if(balancePayAmount>0 && member.getUserIncome()>balancePayAmount){
+//			mustPay=total-temp.getBalancePayAmount()>0?total-temp.getBalancePayAmount():0;
+//		}else if(balancePayAmount>0 && member.getUserIncome()<balancePayAmount){
+//			msg.setMessage(ResultInfo.NO_ENOUGH_FOR_PAY);
+//			return msg;
+//		}
 		
 		order.setSalesYetAmount(total);
 		order.setSalesRateAmount(0);
@@ -427,7 +429,6 @@ public class OrderHandler {
 		boolean flag = false;
 		try {
 			flag = cartService.addOrderAndSaveOrderItem(order, list, cartIds);
-//System.out.println("====插入订单列表信息===="+flag);
 			//修改优惠券状态为临时状态
 			if(hasCoupon){
 				couponItem.setCouponUseStatus(7);
@@ -436,6 +437,7 @@ public class OrderHandler {
 		} catch (Exception e) {
 			flag = false;
 			System.out.println("====插入订单列表信息失败====");
+			e.printStackTrace();
 			msg.setMessage(ResultInfo.paramFormatError);
 			return msg;
 		}
@@ -446,7 +448,6 @@ public class OrderHandler {
 			// 发起支付
 			//PayResult result = payService.requestPay(order.getSalesOpenid(), order.getSalesOrderid(), order.getSalesYetAmount(), list.get(0).getItemProductName() + "...", NameUtils.WECHAT_ORDER_BACK);
 			PayResult result = payService.requestPay(order.getSalesOpenid(), order.getSalesOrderid(), mustPay, list.get(0).getItemProductName() + "...", NameUtils.WECHAT_ORDER_BACK);
-//System.out.println("====================支付"+result.isPaySuccess()+"。====================");
 			if (result.isPaySuccess()) {
 				dto.setInfo(result.getPayData());
 				dto.setSuccess(true);
@@ -459,7 +460,6 @@ public class OrderHandler {
 				msg.setMessage(ResultInfo.ERRORINFO);
 				msg.setData(dto);
 				msg.setStatus(false);
-//System.out.println("====================支付失败了。====================");
 				return msg;
 			}
 		} else if(flag && mustPay==0){
@@ -481,26 +481,25 @@ public class OrderHandler {
 			if(hasCoupon){
 				couponItem.setCouponUseStatus(2);
 				int i=couponItemService.updateCouponItemById(couponItem);
-//System.out.println("================================更新优惠券状态"+i);
 			}
 				
 			//更新账户余额
-			if(balancePayAmount>0){
-				member.setUserIncome(-balancePayAmount);
-				memberService.updateUserIncomeByOpenId(member);
-				
-				//现金使用记录
-				CashLog log=new CashLog();
-				log.setCashLogsIntroduction("订单支出");
-				log.setCashLogsNum(balancePayAmount);
-				log.setCashLogsOpenid(member.getUserOpenid());
-				log.setCashLogsType(2);
-				log.setCashLogsResType(3);
-				log.setCashLogsOrderid(order.getSalesOrderid());
-				log.setCashLogsCreateDate(nowDate);
-				cashLogService.addCashLog(log);
-			
-			}
+//			if(balancePayAmount>0){
+//				member.setUserIncome(-balancePayAmount);
+//				memberService.updateUserIncomeByOpenId(member);
+//
+//				//现金使用记录
+//				CashLog log=new CashLog();
+//				log.setCashLogsIntroduction("订单支出");
+//				log.setCashLogsNum(balancePayAmount);
+//				log.setCashLogsOpenid(member.getUserOpenid());
+//				log.setCashLogsType(2);
+//				log.setCashLogsResType(3);
+//				log.setCashLogsOrderid(order.getSalesOrderid());
+//				log.setCashLogsCreateDate(nowDate);
+//				cashLogService.addCashLog(log);
+//
+//			}
 			
 			rebackServices.loadSingleOrderReward(order);
 			productInfoService.updateProductNumList(order.getSalesOrderid());
@@ -525,8 +524,6 @@ public class OrderHandler {
 		dto.setOrderId(order.getSalesOrderid());
 		msg.setData(dto);
 		msg.setStatus(true);
-//System.out.println("====================支付完成了。====================");
-		
 		return msg;
 	}