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

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

@@ -271,6 +271,7 @@ public class ResultInfo {
 	/**
 	 * 获取RST系统产品信息接口地址
 	 */
-	public static String GET_MACHINE_INFO = "https://rst.iamberry.com/mcahine/getMachineInfo?barCode=";
+	/*public static String GET_MACHINE_INFO = "https://rst.iamberry.com/mcahine/getMachineInfo?barCode=";*/
+	public static String GET_MACHINE_INFO = "http://my.com:9797/mcahine/getMachineInfo?barCode=";
 
 }

tooth-common-web/src/main/java/com/iamberry/common/web/SimpleCORSFilter.java

@@ -32,6 +32,7 @@ public class SimpleCORSFilter implements Filter {
 		origins.add("m.watero.cn");
 		origins.add("static.watero.cn");
 		origins.add("static.iamberry.com");
+		origins.add("s.iamberry.com");
 	}
     public void init(FilterConfig filterConfig) throws ServletException {}
     public void doFilter(ServletRequest servletRequest, ServletResponse

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

@@ -22,7 +22,7 @@ PUBLIC
 			LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR pc ON c.CART_COLOR_ID = pc.COLOR_ID 
 		WHERE
 			C.CART_OPENID = #{openId} 
-		ORDER BY C.CART_ID DESC
+		ORDER BY pc.color_status ASC , C.CART_ID DESC
 	</select>
 	
 	<select id="getCartNumByCartOpenId" parameterType="String" resultType="Integer">

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

@@ -138,6 +138,9 @@
             <if test="stayStatus != null">
                 AND stay_status = #{stayStatus}
             </if>
+            <if test="orderId != null and orderId != ''">
+                AND sales_orderid = #{orderId}
+            </if>
             <if test="userOpenId != null">
                 AND user_openid = #{userOpenId}
             </if>

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/apparatus/ApparatusHandler.java

@@ -58,6 +58,7 @@ public class ApparatusHandler {
         PageBean page = new PageBean();
         page.setPageNumber(pageNO);
         page.setPageSize(pageSize);
+        page.initRecordBegin();
         apparatus.setPage(page);
         //分页查询用户绑定机器信息
         List<Apparatus> apparatusList = apparatusService.listApparatusPage(apparatus);

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

@@ -256,8 +256,7 @@ public class CartHandlers {
 	public ResultMsg  addCart(HttpServletRequest request,
 							  @RequestParam("colorId") Integer colorId,
 							  @RequestParam(value = "cartNum", required = false, defaultValue = "1") Integer cartNum) throws Exception {
-//		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
-		String openId  = "oZ9pv02WMRQgyDVRY1a_daYecwHI";
+		String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
 		ResultMsg remsg=new ResultMsg();
 
 		if (colorId == null || "".equals(colorId) || "null".equals(colorId)) {
@@ -406,7 +405,6 @@ public class CartHandlers {
 		}
 		bean.setText(openId);
 		bean.setPaperData(pageNO, pageSize);
-		System.out.println(bean.getMinNum() + "-->" + bean.getMaxNum());
 		List<ShopOrderAndItemDto> shopOrderList = cartService.selectShopOrder(bean);
 		ShopSystemRule shopSystemRule = this.adminOrderService.getReluByRid(109);
 

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

@@ -187,15 +187,20 @@ public class OrderHandler {
 		//cDto.setPage(new PageBean());
 		//cDto.getPage().setPageSize(12);
 		//cDto.getPage().setPageNumber(pageNO);
-		List<CouponItemDto> list = couponItemService.getCouponItemDtoList(cDto);
-		for(CouponItemDto couponItemDto : list){
+		List<CouponItemDto> couponItemDtoList = couponItemService.getCouponItemDtoList(cDto);
+		List<CouponItemDto> list = new ArrayList<>();
+		for(CouponItemDto couponItemDto : couponItemDtoList){
+			boolean flag = true;
 			if(couponItemDto.getCouponIsNewPeople() == 1 && member.getUserIdentity() != 1){  //当券为新人券，用户为非会员时，需要有牙刷，结算才可以使用该券
-				if(!disable){		//没有牙刷
-					couponItemDto.setCouponIsUse(2);
-					couponItemDto.setCouponNoUseReason("需要购买牙刷才能使用");
+				if(!disable){		//订单中没有牙刷
+					flag = false;
 				}
 			}
+			if(flag){
+				list.add(couponItemDto);
+			}
 		}
+		/*插入优惠券*/
 		dto.setCouponItems(list);
 
 		dto.setCartId(cartIds);// 购物车ID
@@ -493,24 +498,29 @@ public class OrderHandler {
 	public ResultMsg getOrderIntegral(@RequestParam(value = "orderId") String orderId) {
 		ResultMsg msg = new ResultMsg();
 		msg.setResultCode(ResultInfo.ERRORCODE);
-
 		//Integer orderStatus = cartService.selectOrderStatusByOrderId(orderId);
-
+		if(orderId == null || "".equals(orderId)){
+			msg.setResultCode(ResultInfo.ERRORCODE);
+			msg.setMessage(NameUtils.getConfig("未查询到订单信息！"));
+			msg.setStatus(false);
+			return msg;
+		}
 		StayIntegral stayIntegral = new StayIntegral();
 		stayIntegral.setOrderId(orderId);
 		List<StayIntegral>  listStayIntegral = useIntegralService.listStayIntegral(stayIntegral);
-
 		if (listStayIntegral != null && listStayIntegral.size() > 0) {
 			msg.setResultCode(ResultInfo.SUCCESSCODE);
 			msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
 			msg.setData(listStayIntegral.get(0).getStayNumber());
 			msg.setStatus(true);
 			return msg;
+		}else{
+			msg.setResultCode(ResultInfo.SUCCESSCODE);
+			msg.setMessage(NameUtils.getConfig("SUCCESSINFO"));
+			msg.setData(0);
+			msg.setStatus(true);
+			return msg;
 		}
-		msg.setResultCode(ResultInfo.ERRORCODE);
-		msg.setMessage(NameUtils.getConfig("ERRORINFO"));
-		msg.setStatus(false);
-		return msg;
 	}
 
 	@RequestMapping("/paySuccess")

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/pay/ResponseWechatPayHandler.java

@@ -196,30 +196,33 @@ public class ResponseWechatPayHandler {
 
 						CouponItemDto couponItemDto = couponItemService.getCouponItemById(couponId);
 						if(couponItemDto.getCouponType() == 1){  //按照金额
-							couponAmount = couponItemDto.getCouponReduce();
+							couponAmount = couponItemDto.getCouponReduce()/100;
 						}else if(couponItemDto.getCouponType() == 2){  ////按照折扣
-							couponAmount = or.getSalesAmount() - or.getSalesAmount()/(couponItemDto.getCouponReduce()/100);
+							couponAmount = or.getSalesAmount() - or.getSalesAmount()/(couponItemDto.getCouponReduce()/100)/100;
 						}
 					}
 
 					/*----------计算积分-----------
 					*  x * (n1*3 - n1) + y * (n2*3)  - coupon*3 + 400
 					*/
+
 					List<OrderItem> orderItemList = adminOrderService.getShopOrderItemByOrderId(orderIdMD5);
 					Integer allIntegral = 0;  //总积分
 					for(int i=0;i<orderItemList.size();i++){
 						OrderItem orderItem = orderItemList.get(i);
+						Integer amount = orderItem.getItemProductDiscount() / 100;
 						if(orderItem.getItemProductType()==100){//类型为电动牙刷
-							Integer integral = orderItem.getItemProductDiscount() * (orderItem.getItemNum()*3-orderItem.getItemNum());
+							Integer integral = amount * (orderItem.getItemNum()*3-orderItem.getItemNum());
 							allIntegral += integral;
 						}else{
-							Integer integral = orderItem.getItemProductDiscount() * (orderItem.getItemNum()*3);
+							Integer integral = amount * (orderItem.getItemNum()*3);
 							allIntegral += integral;
 						}
 					}
 					if(couponAmount > 0){  //有优惠券减去优惠券的金额
 						allIntegral += -couponAmount*3;
 					}
+					ratFWLogger.error(this, "订单："+ orderIdMD5 +"订单使用优惠卷金额：" + couponAmount +"所得积分为："+allIntegral);
 					boolean flag = apparatusService.addStayIntegral(or.getSalesOpenid(),3,allIntegral,or.getSalesOrderid());
 					ratFWLogger.info("积分是否入账："+ flag);
 					/*----------计算积分-----------*/