Merge remote-tracking branch 'origin/developer' into developerA

# Conflicts:
#	src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java
#	src/main/resources/mapper/OrderCommonMapper.xml

src/main/java/com/caimei365/order/controller/BaseApi.java

@@ -42,9 +42,9 @@ public class BaseApi {
         return ResponseJson.error(-99, "Token失效请重新登录!", null);
     }
 
-    /**
-     * 老用户发短信临时接口
-     */
+//    /**
+//     * 老用户发短信临时接口
+//     */
 //    @GetMapping("/getOld")
 //    public void getOldUser() {
 //        remoteCallService.getOldUser();

src/main/java/com/caimei365/order/mapper/CartClubMapper.java

@@ -108,4 +108,8 @@ public interface CartClubMapper {
     Integer getClubTypeById(Integer userId);
 
     void deleteCartSku(@Param("userId") Integer userId, @Param("oldSkuId") Integer oldSkuId);
+
+
+    String getHelpContent(Integer helpId);
+
 }

src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -177,5 +177,8 @@ public interface OrderCommonMapper {
     Integer findMaxStock(Integer productId);
 
     String findOnlinePayWays(Integer shopOrderId);
+
+    String getHelpContent(Integer helpId);
+
 }
 

src/main/java/com/caimei365/order/model/vo/CartItemVo.java

@@ -171,4 +171,13 @@ public class CartItemVo implements Serializable {
      * 商品分账号
      */
     private String splitCode;
+
+    /**
+     * 能否退货  1 能 2不能
+     */
+    private Integer returnGoodsStutas;
+    /**
+     * 特殊商品退货须知提示  （取后台帮助中心id1040的数据）
+     */
+    private String  helpContent;
 }

src/main/java/com/caimei365/order/model/vo/CartShopVo.java

@@ -69,4 +69,13 @@ public class CartShopVo implements Serializable {
      * 商品分帐号
      */
     private String splitCode;
+
+    /**
+     * 能否退货  1 能 2不能
+     */
+    private Integer returnGoodsStutas;
+    /**
+     * 特殊商品退货须知提示  （取后台帮助中心id1040的数据）
+     */
+    private String  helpContent;
 }

src/main/java/com/caimei365/order/model/vo/OrderProductVo.java

@@ -252,4 +252,14 @@ public class OrderProductVo implements Serializable {
      * 超级会员价格标签
      */
     private String svipPriceTag;
+
+    /**
+     * 能否退货  1 能 2不能
+     */
+    private Integer returnGoodsStutas;
+
+    /**
+     * 特殊商品退货须知提示  （取后台帮助中心id1040的数据）
+     */
+    private String  helpContent;
 }

src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -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);
     }
 
@@ -1603,6 +1637,12 @@ public class CartClubServiceImpl implements CartClubService {
         CartItemVo cartItemVo = cartClubMapper.getCartItemByProductId(cartDto.getSkuId());
         if (null == cartItemVo) {
             return ResponseJson.error("商品数据异常！", null);
+        }else{
+            //是否能退货
+            if(null!=cartItemVo.getReturnGoodsStutas()&&2==cartItemVo.getReturnGoodsStutas()){
+                String helpContent = orderCommonMapper.getHelpContent(1040);
+                cartItemVo.setHelpContent(helpContent);
+            }
         }
         // 用户身份
         Integer userIdentity = baseMapper.getIdentityByUserId(cartDto.getUserId());
@@ -1798,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);
@@ -1813,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);
     }
 

src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -218,6 +218,11 @@ public class OrderClubServiceImpl implements OrderClubService {
                 if (recharge) {
                     order.setRechargeGoods(true);
                 }
+                //是否能退货
+                if(null!=orderProduct.getReturnGoodsStutas()&&2==orderProduct.getReturnGoodsStutas()){
+                    String helpContent = orderCommonMapper.getHelpContent(1040);
+                    orderProduct.setHelpContent(helpContent);
+                }
                 // 总税费
                 expensesOfTaxation.set(MathUtil.add(expensesOfTaxation.get(), orderProduct.getTotalAddedValueTax()).doubleValue());
                 //已发货数量
@@ -269,7 +274,22 @@ public class OrderClubServiceImpl implements OrderClubService {
         }
         // 收货地址
         OrderUserinfoVo userInfo = addressMapper.getOrderUserinfo(orderId);
-
+        //订单中存在不能退货的商品则给出不能退货提示
+        boolean flag=false;
+        String helpContent=null;
+        if(null!=shopOrderList&&shopOrderList.size()>0){
+            for (ShopOrderVo so:shopOrderList) {
+                List<OrderProductVo> orderProductList = so.getOrderProductList();
+                if(null!=orderProductList&&orderProductList.size()>0){
+                    for (OrderProductVo op:orderProductList) {
+                        if(null!=op.getReturnGoodsStutas()&&op.getReturnGoodsStutas()==2){
+                            flag=true;
+                            helpContent=op.getHelpContent();
+                        }
+                    }
+                }
+            }
+        }
         Map<String, Object> map = new HashMap<>();
         map.put("order", order);
         map.put("shopOrderList", shopOrderList);
@@ -279,6 +299,13 @@ public class OrderClubServiceImpl implements OrderClubService {
         map.put("discernReceiptList", discernReceiptList);
         map.put("returnedPurchaseList", returnedPurchaseList);
         map.put("clause", clause);
+        if(flag){
+            map.put("returnGoodsStutas", 2);
+            map.put("helpContent", helpContent);
+        }else{
+            map.put("returnGoodsStutas", 1);
+            map.put("helpContent", null);
+        }
         return ResponseJson.success(map);
     }
 

src/main/java/com/caimei365/order/service/impl/RemoteCallServiceImpl.java

@@ -73,6 +73,8 @@ public class RemoteCallServiceImpl implements RemoteCallService {
         try {
             //测试环境手机号允许发短信
             List<String> list = new ArrayList<>();
+            list.add("18670511721");
+            list.add("18229303772");
             list.add("15017915300");
             list.add("17798247695");
             list.add("15917362709");
@@ -186,16 +188,19 @@ public class RemoteCallServiceImpl implements RemoteCallService {
     @Override
     public void getOldUser() {
         //ross挑战赛
-        List<PushMessageUserVo> pushUsers = messagePushMapper.findOldUser();
+        List<PushMessageUserVo> pushUsers =messagePushMapper.findOldUser();
         String url = "https://zp.caimei365.com/12/ross/activity/challenge";
         List<String> list = new ArrayList<String>();
-//        list.add("15827317748");
-//        list.add("15017915300");
-//        list.add("17798247695");
+        list.add("15827317748");
+        list.add("15017915300");
+        list.add("17798247695");
+
         list.add("15917362709");
         list.add("18476937515");
         list.add("18605868824");
+        list.add("17798247695");
         list.add("18670511721");
+        list.add("18229303772");
         list.forEach(l -> {
             PushMessageUserVo pushMessageUserVo = new PushMessageUserVo();
             pushMessageUserVo.setMobile(l);
@@ -207,8 +212,8 @@ public class RemoteCallServiceImpl implements RemoteCallService {
             p.setShortLink(link);
             p.setMarkId(23);
             messagePushMapper.insertNewLink(p);
-
-            String content = "【西班牙ROSS】亲，ROSS抖音挑战赛开始啦，发布ROSS仪器视频赢网红探店和千元导胶！戳此 caimei365.com/t/" + link + " 查看视频发布教程，退订回T;";
+            String  content="【西班牙ROSS】抖音视频挑战赛仅剩7天，再不来大奖就是别人的啦！发视频还可赢导胶一瓶，错过不再有!速来报名! caimei365.com/t/"+link+" 退订回T";
+//            String content = "【西班牙ROSS】亲，ROSS抖音挑战赛开始啦，发布ROSS仪器视频赢网红探店和千元导胶！戳此 caimei365.com/t/" + link + " 查看视频发布教程，退订回T;";
             getSendSms(3,23, p.getMobile(), content);
             log.info("userId-------------------->" + p.getUserId() + "发送手机号------------------------>" + p.getMobile() + "短信-------------->" + content);
         });

src/main/resources/mapper/CartClubMapper.xml

@@ -18,6 +18,7 @@
         c.shopID AS shopId,
         s.name AS shopName,
         s.logo AS shopLogo,
+        p.returnGoodsStutas,
         s.shopType as shopType
         <if test="status!=null and status == 1">
             ,p.splitCode
@@ -39,6 +40,7 @@
         s.shopID AS shopId,
         s.name AS shopName,
         s.logo AS shopLogo,
+        p.returnGoodsStutas,
         p.productType
         FROM shop s
         LEFT JOIN product p ON p.shopID = s.shopID
@@ -314,7 +316,8 @@
                csp.priceType                as svipPriceType,
                csp.discount                 as svipDiscount,
                csp.discountPrice            as svipDiscountPrice,
-               p.productType
+               p.productType,
+               p.returnGoodsStutas
         FROM cm_sku cs
                  LEFT JOIN product p on p.productID = cs.productId
                  LEFT JOIN cm_svip_product csp ON p.productID = csp.productId
@@ -331,4 +334,8 @@
         FROM club
         WHERE userID = #{userId}
     </select>
+
+    <select id="getHelpContent" resultType="java.lang.String">
+        select content from helppage where helpPageID=#{helpId}
+    </select>
 </mapper>

src/main/resources/mapper/MessagePushMapper.xml

@@ -20,16 +20,14 @@
         WHERE shortLink = #{shortLink}
     </select>
     <select id="findOldUser" resultType="com.caimei365.order.model.vo.PushMessageUserVo">
-        SELECT cu.mobile,
-               cu.authId AS userId
-        FROM cm_brand_club_user cu
-                 LEFT JOIN cm_brand_auth a ON cu.authId = a.id
-        WHERE cu.authUserId = 12
-          AND cu.delFlag = 0
-          AND (a.id IS NULL || a.delFlag = 0)
-          AND cu.id NOT IN (51, 56, 57)
-          and cu.mobile !='18679982260'
-        ORDER BY cu.addTime DESC
+        select cb.mobile  as mobile,
+        cb.authUserId as userId
+        from cm_brand_auth ca
+            left join cm_brand_club_user cb on ca.id=cb.authid
+        where cb.mobile
+            is not null and ca.authUserId=12
+          and  ca.`STATUS`=1
+        group by cb.mobile
     </select>
     <select id="findOldUserTow" resultType="com.caimei365.order.model.vo.PushMessageUserVo">
         SELECT

src/main/resources/mapper/OrderCommonMapper.xml

@@ -113,7 +113,8 @@
                cop.svipDiscount,
                p.productCategory  as productCategory,
                p.productType,
-               p.productCode
+               p.productCode,
+               p.returnGoodsStutas
         FROM cm_order_product cop
                  LEFT JOIN product p ON cop.productID = p.productID
         WHERE cop.shopOrderID = #{shopOrderId}
@@ -741,6 +742,10 @@
         ORDER BY stock DESC
         LIMIT 1
     </select>
+
+    <select id="getHelpContent" resultType="java.lang.String">
+        select content from helppage where helpPageID=#{helpId}
+    </select>
     <select id="findOnlinePayWays" resultType="java.lang.String">
         select onlinePayWays
         from cm_shop_order