|
@@ -910,12 +910,22 @@ public class CartClubServiceImpl implements CartClubService {
|
|
|
if (firstSize != shopList.size()) {
|
|
|
shopList = cartClubMapper.getCartShopsByProductIds(userId, skuIdList, 2);
|
|
|
}
|
|
|
+ String helpContent=null;
|
|
|
+ boolean flag=false;
|
|
|
if (null != shopList && shopList.size() > 0) {
|
|
|
// 遍历供应商列表
|
|
|
List<String> finalIdList = skuIdList;//购物车商品skuId列表
|
|
|
Integer finalUserIdentity = userIdentity;
|
|
|
Integer finalUserClubType = userClubType;
|
|
|
Integer finalUserIdentity1 = userIdentity;
|
|
|
+ for (int i=0;i<shopList.size();i++) {
|
|
|
+ //订单中存在不能退货的商品则给出不能退货提示
|
|
|
+ if(null!=shopList.get(i).getReturnGoodsStutas()&&shopList.get(i).getReturnGoodsStutas()==2){
|
|
|
+ flag=true;
|
|
|
+ helpContent = cartClubMapper.getHelpContent(1040);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
shopList.forEach(shop -> {
|
|
|
if (null != shop) {
|
|
|
// 该供应商下商品种类
|
|
@@ -1200,6 +1210,13 @@ public class CartClubServiceImpl implements CartClubService {
|
|
|
resultData.put("userBeans", userBeans);
|
|
|
resultData.put("includeRecharge", includeRecharge);
|
|
|
resultData.put("couponList", couponList);
|
|
|
+ if(flag){
|
|
|
+ resultData.put("returnGoodsStutas", 2);
|
|
|
+ resultData.put("helpContent", helpContent);
|
|
|
+ }else{
|
|
|
+ resultData.put("returnGoodsStutas", 1);
|
|
|
+ resultData.put("helpContent", null);
|
|
|
+ }
|
|
|
return ResponseJson.success(resultData);
|
|
|
}
|
|
|
|
|
@@ -1278,12 +1295,22 @@ public class CartClubServiceImpl implements CartClubService {
|
|
|
// 商品的供应商列表
|
|
|
List<CartShopVo> shopList = cartClubMapper.getShopsByProductIds(productIdList);
|
|
|
//按供应商分类统计商品
|
|
|
+ String helpContent=null;
|
|
|
+ boolean flag=false;
|
|
|
if (null != shopList && shopList.size() > 0) {
|
|
|
// 遍历供应商列表
|
|
|
List<Integer> finalIdList = skuIdList;//商品id列表
|
|
|
Integer finalUserIdentity = userIdentity;
|
|
|
Integer finalUserClubType = userClubType;
|
|
|
Integer finalUserIdentity1 = userIdentity;
|
|
|
+ for (int i=0;i<shopList.size();i++) {
|
|
|
+ //订单中存在不能退货的商品则给出不能退货提示
|
|
|
+ if(null!=shopList.get(i).getReturnGoodsStutas()&&shopList.get(i).getReturnGoodsStutas()==2){
|
|
|
+ flag=true;
|
|
|
+ helpContent = cartClubMapper.getHelpContent(1040);
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
shopList.forEach(shop -> {
|
|
|
if (null != shop) {
|
|
|
// 该供应商下商品种类
|
|
@@ -1568,6 +1595,13 @@ public class CartClubServiceImpl implements CartClubService {
|
|
|
resultData.put("userBeans", userBeans);
|
|
|
resultData.put("includeRecharge", includeRecharge);
|
|
|
resultData.put("couponList", couponList);
|
|
|
+ if(flag){
|
|
|
+ resultData.put("returnGoodsStutas", 2);
|
|
|
+ resultData.put("helpContent", helpContent);
|
|
|
+ }else{
|
|
|
+ resultData.put("returnGoodsStutas", 1);
|
|
|
+ resultData.put("helpContent", null);
|
|
|
+ }
|
|
|
return ResponseJson.success(resultData);
|
|
|
}
|
|
|
|
|
@@ -1804,6 +1838,22 @@ public class CartClubServiceImpl implements CartClubService {
|
|
|
Integer userBeans = baseMapper.getUserBeans(cartDto.getUserId());
|
|
|
// 获取用户可用优惠券
|
|
|
List<CouponVo> couponList = getUserCartCoupons(cartList, cartDto.getSource(), cartDto.getUserId());
|
|
|
+ //订单中存在不能退货的商品则给出不能退货提示
|
|
|
+ boolean flag=false;
|
|
|
+ String helpContent=null;
|
|
|
+ if(null!=shopList&&shopList.size()>0){
|
|
|
+ for (CartShopVo so:shopList) {
|
|
|
+ List<CartItemVo> carList = so.getCartList();
|
|
|
+ if(null!=carList&&carList.size()>0){
|
|
|
+ for (CartItemVo op:carList) {
|
|
|
+ if(null!=op.getReturnGoodsStutas()&&op.getReturnGoodsStutas()==2){
|
|
|
+ flag=true;
|
|
|
+ helpContent=op.getHelpContent();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
// 包装返回数据
|
|
|
Map<String, Object> resultData = new HashMap<>();
|
|
|
resultData.put("list", shopList);
|
|
@@ -1819,6 +1869,13 @@ public class CartClubServiceImpl implements CartClubService {
|
|
|
resultData.put("includeRecharge", includeRecharge);
|
|
|
resultData.put("promotions", totalPromotions);
|
|
|
resultData.put("couponList", couponList);
|
|
|
+ if(flag){
|
|
|
+ resultData.put("returnGoodsStutas", 2);
|
|
|
+ resultData.put("helpContent", helpContent);
|
|
|
+ }else{
|
|
|
+ resultData.put("returnGoodsStutas", 1);
|
|
|
+ resultData.put("helpContent", null);
|
|
|
+ }
|
|
|
return ResponseJson.success(resultData);
|
|
|
}
|
|
|
|