修改了生成订单的方法

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

@@ -1,7 +1,10 @@
 package com.iamberry.wechat.core.entity.cart;
 
+import com.iamberry.wechat.core.entity.product.SalesUserGift;
+
 import java.io.Serializable;
 import java.util.Date;
+import java.util.List;
 
 /**
  * 
@@ -27,8 +30,6 @@ public class CartDto implements Serializable{
 
 	private String productName;		//商品名称
 
-	private Integer productType;		//商品类型id
-
 	private Integer productPrice;		//商品原价
 	
 	private Integer productStatus;		//商品状态
@@ -43,23 +44,36 @@ public class CartDto implements Serializable{
 	
 	private String productColor;			//产品颜色		不再用代码表示，直接使用汉字- 1：红色	2：橙色	3：黄色	4：绿色 5：青色	6：蓝色	7：紫色	8：白色
 
+	private Integer productChildType;	//产品类型
+
 	private Integer cartColorId;//产品颜色id
+
+	private Integer cartIsSource;	//商品来源
+
 	private List<SalesUserGift> salesUserGiftList; //赠品集合
 
-	public Integer getCartColorId() {
-		return cartColorId;
+	public Integer getCartIsSource() {
+		return cartIsSource;
 	}
 
-	public void setCartColorId(Integer cartColorId) {
-		this.cartColorId = cartColorId;
+	public void setCartIsSource(Integer cartIsSource) {
+		this.cartIsSource = cartIsSource;
 	}
 
-	public Integer getProductType() {
-		return productType;
+	public Integer getProductChildType() {
+		return productChildType;
 	}
 
-	public void setProductType(Integer productType) {
-		this.productType = productType;
+	public void setProductChildType(Integer productChildType) {
+		this.productChildType = productChildType;
+	}
+
+	public Integer getCartColorId() {
+		return cartColorId;
+	}
+
+	public void setCartColorId(Integer cartColorId) {
+		this.cartColorId = cartColorId;
 	}
 
 	public String getProductColor() {

iamberry-wechat-interface/src/main/java/com/iamberry/wechat/face/cart/CartService.java

@@ -55,6 +55,27 @@ public interface CartService {
 	 * @return
 	 */
 	public List<CartDto> selectCartItemByListId(Integer[] carts);
+
+	/**
+	 * 批量获取购物车集合
+	 * @param carts
+	 * @return
+	 */
+	List<CartDto> listCartByIds(Integer[] carts);
+
+	/**
+	 * 查询购物车产品颜色信息
+	 * @param cartDto
+	 * @return
+	 */
+	CartDto selectCartProductColor(CartDto cartDto);
+
+	/**
+	 * 查询购物车产品配件信息
+	 * @param cartDto
+	 * @return
+	 */
+	CartDto getCartProductFitting(CartDto cartDto);
 	
 	/**
 	 * 保存订单、订单项

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/CartServiceImpl.java

@@ -122,6 +122,21 @@ public class CartServiceImpl implements CartService {
 	}
 
 	@Override
+	public List<CartDto> listCartByIds(Integer[] carts) {
+		return cartDao.listCartByIds(carts);
+	}
+
+	@Override
+	public CartDto selectCartProductColor(CartDto cartDto) {
+		return cartDao.selectCartProductColor(cartDto);
+	}
+
+	@Override
+	public CartDto getCartProductFitting(CartDto cartDto) {
+		return cartDao.getCartProductFitting(cartDto);
+	}
+
+	@Override
 	public boolean addOrderAndSaveOrderItem(Order order, List<OrderItem> items, List<Integer> cartIds) throws Exception {
 		// TODO Auto-generated method stub
 		int count = cartDao.insertOrderInfo(order);

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/CartDao.java

@@ -56,6 +56,27 @@ public interface CartDao {
 	public List<CartDto> selectCartItemByListId(Integer[] carts);
 
 	/**
+	 * 批量获取购物车集合
+	 * @param carts
+	 * @return
+	 */
+	List<CartDto> listCartByIds(Integer[] carts);
+
+	/**
+	 * 查询购物车产品颜色信息
+	 * @param cartDto
+	 * @return
+	 */
+	CartDto selectCartProductColor(CartDto cartDto);
+
+	/**
+	 * 查询购物车产品配件信息
+	 * @param cartDto
+	 * @return
+	 */
+	CartDto getCartProductFitting(CartDto cartDto);
+
+	/**
 	 * 添加订单信息
 	 * @param order
 	 * @return

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/cart/dao/impl/CartDaoImpl.java

@@ -103,6 +103,20 @@ public class CartDaoImpl implements CartDao{
 		return cartMapper.selectCartItemByListId(carts);
 	}
 
+	@Override
+	public List<CartDto> listCartByIds(Integer[] carts) {
+		return cartMapper.listCartByIds(carts);
+	}
+
+	@Override
+	public CartDto selectCartProductColor(CartDto cartDto) {
+		return cartMapper.selectCartProductColor(cartDto);
+	}
+
+	@Override
+	public CartDto getCartProductFitting(CartDto cartDto) {
+		return cartMapper.getCartProductFitting(cartDto);
+	}
 
 	@Override
 	public Integer insertOrderInfo(Order order) {

iamberry-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/CartMapper.java

@@ -52,6 +52,27 @@ public interface CartMapper {
 	 * @return
 	 */
 	public List<CartDto> selectCartItemByListId(Integer[] carts);
+
+	/**
+	 * 批量获取购物车集合
+	 * @param carts
+	 * @return
+	 */
+	List<CartDto> listCartByIds(Integer[] carts);
+
+	/**
+	 * 查询购物车产品颜色信息
+	 * @param cartDto
+	 * @return
+	 */
+	CartDto selectCartProductColor(CartDto cartDto);
+
+	/**
+	 * 查询购物车产品配件信息
+	 * @param cartDto
+	 * @return
+	 */
+	CartDto getCartProductFitting(CartDto cartDto);
 	
 	//根据orderid查询用户openid和订单状态
 	public ShopSalesOrderDto getOpenIdAndStatus(String salesOrderid);

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

@@ -244,6 +244,54 @@ PUBLIC
 		AND 
 			I.COUPON_ITEM_USER_OPENID = #{couponItemUseropenid}
 	</select>
+
+	<!-- 批量获取购物车集合 -->
+	<select id="listCartByIds" parameterType="java.util.List" resultType="CartDto">
+		SELECT
+			C.CART_ID cartId,
+			C.CART_NUM cartNum,
+			C.cart_is_source cartIsSource
+		FROM
+		TB_IAMBERRY_SHOP_CART C
+		WHERE
+			C.CART_ID IN (
+			<foreach collection="array" item="item" separator=",">
+				#{item}
+			</foreach>)
+		ORDER BY C.CART_ID DESC
+	</select>
+
+	<!-- 查询购物车产品颜色信息 -->
+	<select id="selectCartProductColor" parameterType="CartDto" resultType="CartDto">
+		SELECT
+			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
+		FROM
+			TB_IAMBERRY_SHOP_CART C
+		LEFT JOIN TB_IAMBERRY_PRODUCT_INFO G ON C.CART_PRODUCT_ID = G.PRODUCT_ID
+		LEFT JOIN TB_IAMBERRY_PRODUCT_COLOR PC ON C.CART_COLOR_ID = PC.COLOR_ID
+		WHERE
+		C.CART_ID = #{cartId}
+		ORDER BY C.CART_ID DESC
+	</select>
+
+	<!-- 查询购物车产品配件信息 -->
+	<select id="getCartProductFitting" parameterType="CartDto" resultType="CartDto">
+		SELECT
+			C.CART_ID cartId, G.PRODUCT_ID cartProductId, f.FITTINGS_ID cartColorId, G.PRODUCT_STATUS productStatus,
+			C.CART_NUM cartNum, G.PRODUCT_NAME productName, f.FITTINGS_DISCOUNT productPrice,
+			G.PRODUCT_INTRODUCE_IMG productIntroduceImg, f.FITTINGS_PRICE productDiscount, f.FITTINGS_BAR productRemark,
+			f.FITTINGS_COLOR productColor, G.PRODUCT_CHILD_TYPE productChildType,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
+		LEFT JOIN TB_IAMBERRY_PRODUCT_FITTINGS f ON C.CART_COLOR_ID = f.FITTINGS_ID
+		WHERE
+		C.CART_ID = #{cartId}
+		ORDER BY C.CART_ID DESC
+	</select>
 	
 	<!-- 根据购物车ID数组，批量获取购物车集合 -->
 	<select id="selectCartItemByListId" parameterType="java.util.List" resultType="CartDto">
@@ -251,7 +299,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_TYPE productType
+			pc.COLOR_NAME productColor, G.PRODUCT_CHILD_TYPE productChildType
 		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/order/OrderHandler.java

@@ -267,7 +267,7 @@ public class OrderHandler {
 			msg.setMessage(ResultInfo.integralOutError);
 			return msg;
 		}*/
-		List<CartDto> cartDtos = cartService.selectCartItemByListId(cartId);
+		List<CartDto> cartDtos = cartService.listCartByIds(cartId);
 		if (cartDtos == null || cartDtos.size() <= 0) {// 根据购物车ID，查询数据库中对应的产品信息（ID、产品状态）
 			msg.setMessage(ResultInfo.cartEmptyError);
 			return msg;
@@ -282,6 +282,14 @@ public class OrderHandler {
 		List<Integer> cartIds = new ArrayList<Integer>();
 		
 		for (CartDto cartDto : cartDtos) {
+			//判断购买产品是产品还是配件
+			switch (cartDto.getCartIsSource()) {
+				case 1:
+					cartDto = cartService.selectCartProductColor(cartDto);
+					break;
+				case 2:
+					cartDto = cartService.getCartProductFitting(cartDto);
+			}
 			if (cartDto.getProductStatus() != null && cartDto.getProductStatus().intValue() == 1) {
 				cartIds.add(cartDto.getCartId());
 				Integer subTotal = cartDto.getCartNum() * cartDto.getProductPrice(); // 小计
@@ -294,13 +302,11 @@ public class OrderHandler {
 				item.setItemProductPic(cartDto.getProductIntroduceImg());
 				item.setItemSalesOrderid(order.getSalesOrderid());
 				item.setItemTotal(subTotal);
-				item.setItemProductType(cartDto.getProductType());
 				item.setItemProductPrice(cartDto.getProductDiscount());
 				item.setItemColorId(cartDto.getCartColorId());
-				/*item.setItemProductColor();
-				item.setItemProductChildType();
-				item.setItemIsSource();*/
-
+				item.setItemProductColor(cartDto.getProductColor());
+				item.setItemProductChildType(cartDto.getProductChildType());
+				item.setItemIsSource(cartDto.getCartIsSource());
 				list.add(item);
 			}
 		}

iamberry-wechat-web/src/main/java/com/iamberry/wechat/handles/warranty/WarrantyCardHandler.java

@@ -5,18 +5,13 @@ import com.iamberry.wechat.core.entity.ResultMsg;
 import com.iamberry.wechat.core.entity.WechatUtils;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.member.Member;
-import com.iamberry.wechat.core.entity.product.ProductColor;
-import com.iamberry.wechat.core.entity.warrantyCard.WarrantyCard;
 import com.iamberry.wechat.face.admin.SystemService;
-import com.iamberry.wechat.face.cart.ProductInfoService;
-import com.iamberry.wechat.face.mq.EfastOrderService;
 import com.iamberry.wechat.face.phone.PhoneCodeService;
 import com.iamberry.wechat.face.warranty.WarrantyService;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.ResultInfo;
-import net.sf.json.JSONArray;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.ParseException;
 import org.json.JSONException;
@@ -34,9 +29,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.io.IOException;
 import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/share_zhuanpan.html

@@ -80,7 +80,7 @@
         window.wxFriend = {
             "appId": "",
             "imgUrl":domanUrl + '/iamberry/common/shop/images/1.png',
-            "link":domanUrl+"/iamberry/wechat/activity/share_luck_draw",
+            "link":"https:" + domanUrl+"/iamberry/wechat/activity/share_luck_draw",
             "desc":"哎呀！我差一点就抽到iPhone7了！亮黑版，32G啊！小伙伴你也来试试吧！",//描述
             "title":"我离iPhone7亮黑版 32G仅一步之遥，小伙伴你快来一起抽吧！",			//标题
             "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/zhuanpan.html

@@ -114,7 +114,7 @@
         window.wxFriend = {
             "appId": "",
             "imgUrl":'//s.iamberry.com/images/shop/8.png',
-            "link":domanUrl+"/iamberry/wechat/activity/go_luck_draw",
+            "link":"https:" + domanUrl+"/iamberry/wechat/activity/go_luck_draw",
             "desc":"万圣节8秒冲奶，一键搞定捣蛋宝宝，快来围观爱贝源智能冲奶机，有大奖品抽哦！",//描述
             "title":"3次免费抽，100%中奖，宝宝手推车抱回家，快来转转转！",			//标题
             "netError":"您的网络异常，请刷新重试!如多次刷新无效，请向我们反应 ~",

watero-wechat-web/src/main/webapp/common/shop/js/page/chanpin_details.js

@@ -91,7 +91,7 @@ mui.ready(function() {
             }
         })
     });
-    var url = domanUrl + base_path + "//product/desc?productId=" + productId +'&colorId='+colorId + "&shareOpenid=" + shareOpenid;
+    var url = "https:" + domanUrl + base_path + "//product/desc?productId=" + productId +'&colorId='+colorId + "&shareOpenid=" + shareOpenid;
     window.repleFlag = false;
     window.wxFriend = {
         "appId": "",

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center.js

@@ -249,7 +249,7 @@ function fenxiao_center_data() {
                 document.querySelector('.user_name').innerHTML = dt.data.userName;
                 document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
                 var shareOpenid = dt.data.shareOpenid;
-                var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
+                var link = "https:" + domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",

watero-wechat-web/src/main/webapp/common/shop/js/page/fenxiao_center2.js

@@ -172,7 +172,7 @@ function fenxiao_center_data() {
                 document.querySelector('.user_name').innerHTML = dt.data.userName;
                 document.querySelector('.wechat_name').innerHTML = dt.data.nickName;
                 var shareOpenid = dt.data.shareOpenid;
-                var link = domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
+                var link = "https:" + domanUrl + base_path + "/drp/share2WM?shareOpenid=" + shareOpenid;
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",

watero-wechat-web/src/main/webapp/common/shop/js/page/iamberry_video.js

@@ -14,7 +14,7 @@ mui.ready(function () {
         success: function (dt) {
             if (dt.status) {
                 var shareOpenid = dt.data.userOpenid;
-                var link = domanUrl + base_path + "/agentWechat/goPublicity?shareOpenid=" + shareOpenid + "&userType=" + userType;
+                var link = "https:" + domanUrl + base_path + "/agentWechat/goPublicity?shareOpenid=" + shareOpenid + "&userType=" + userType;
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",

watero-wechat-web/src/main/webapp/common/shop/js/page/index.js

@@ -56,7 +56,7 @@ mui.ready(function() {
                     }, false)
                 });
                 var shareOpenid = dt.data.memberOpenid;
-                var link = domanUrl + base_path + "/index?shareOpenid=" + shareOpenid;
+                var link = "https:" + domanUrl + base_path + "/index?shareOpenid=" + shareOpenid;
                 window.repleFlag = false;
                 window.wxFriend = {
                     "appId": "",

watero-wechat-web/src/main/webapp/view/push_jiangli.html

@@ -70,7 +70,7 @@
                 console.log(xhr);
             }
         })
-        var url = domanUrl+"/watero/view/push_jiangli.html";
+        var url = "https:" + domanUrl+"/watero/view/push_jiangli.html";
         window.repleFlag = false;
         window.wxFriend = {
             "appId": "",

watero-wechat-web/src/main/webapp/view/rent/i_want_lease.html

@@ -337,7 +337,7 @@
                         $('#rentType').html(type_item);
 
                         //分享
-                        var url = domanUrl + base_path + "/rent_order/goWantLease?shareOpenid=" + shareOpenid;
+                        var url = "https:" + domanUrl + base_path + "/rent_order/goWantLease?shareOpenid=" + shareOpenid;
                         window.repleFlag = false;
                         window.wxFriend = {
                             "appId": "",

watero-wechat-web/src/main/webapp/view/rent/lease_order_details.html

@@ -320,7 +320,7 @@
                 //console.log(dt);
                 if(dt.status) {
                     mask.show();//显示遮罩
-                    var url = encodeURI('//' + window.location.host+'/watero/view/rent/lease_for_my_equipment.html?shareId=' + dt.data);
+                    var url = encodeURI('https://' + window.location.host+'/watero/view/rent/lease_for_my_equipment.html?shareId=' + dt.data);
                     var desc = userNickName + "送给你一台净水机，为你送上一份饮水健康。";
                     window.repleFlag = false;
                     window.hiddenAllWechatMenu = false;		//window.wxFriend window.repleWxData

watero-wechat-web/src/main/webapp/view/water_competition_for_me.html

@@ -119,7 +119,7 @@
                 }else{
                     console.log(dt);
                     if(dt.status) {
-                        var url = '//'+document.domain+'/watero/view/water_competition.html?shareId='+dt.data;
+                        var url = 'https://'+document.domain+'/watero/view/water_competition.html?shareId='+dt.data;
                         window.wxData = {
                             "appId": "", // 服务号可以填写appId
                             "imgUrl":'//s.iamberry.com/watero/images/shop/share-lease.png',