111

crmeb-admin/src/main/java/com/zbkj/admin/controller/merchant/NewMerchantApi.java

@@ -347,6 +347,14 @@ public class NewMerchantApi {
 
         Page<MerchantSmsTemplate> productPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
         List<MerchantSmsTemplate> list = merchantSmsTemplateService.list(queryWrapper);
+        for (MerchantSmsTemplate merchantSmsTemplate : list) {
+            String tempId = merchantSmsTemplate.getTempId();
+            MerchantSmsTiming merchantSmsTiming = merchantSmsTimingService.selectByTempId(tempId);
+            Integer isStatus = merchantSmsTiming.getIsStatus();
+            merchantSmsTemplate.setStatus(String.valueOf(isStatus));
+            merchantSmsTemplateService.updateById(merchantSmsTemplate);
+        }
+
 
         return CommonResult.success(CommonPage.restPage(CommonPage.copyPageInfo(productPage, list)));
 //        Page<MerchantSmsTemplate> page = new Page<MerchantSmsTemplate>( pageNo, pageSize );
@@ -392,6 +400,7 @@ public class NewMerchantApi {
             MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.selectByTempId(tempId);
             if (null != merchantSmsTemplate) {
                 merchantSmsTemplate.setLastUpdateTime(new Date());
+                merchantSmsTemplateService.updateById(merchantSmsTemplate);
             }
 
             return CommonResult.success(merchantSms);

crmeb-admin/src/main/java/com/zbkj/admin/controller/platform/NewPlatformApi.java

@@ -317,6 +317,12 @@ public class NewPlatformApi {
             queryWrapper.eq(UserBypassAccount::getEnterpriseId, id);
             queryWrapper.eq(UserBypassAccount::getIsDelete, 0);
             List<UserBypassAccount> list = userBypassAccountService.list(queryWrapper);
+            for (UserBypassAccount userBypassAccount : list) {
+                Integer userId = userBypassAccount.getUserId();
+                User user = userService.getById(userId);
+                Integer isAllOrders = user.getIsAllOrders();
+                userBypassAccount.setIsAllOrders(isAllOrders);
+            }
             return CommonResult.success(list);
         } catch (Exception e) {
             return CommonResult.failed("查询企业账户下的子账号失败，接口错误");

crmeb-common/src/main/java/com/zbkj/common/model/cat/CartShare.java

@@ -69,6 +69,9 @@ public class CartShare implements Serializable {
     @ApiModelProperty(value = "购物车是否失效 0失效 1有效")
     private Integer isInvalid;
 
+    @ApiModelProperty(value = "分享id")
+    private String shareId;
+
 
 
 

crmeb-common/src/main/java/com/zbkj/common/model/merchant/MerchantSmsTemplate.java

@@ -47,6 +47,9 @@ public class MerchantSmsTemplate implements Serializable {
     @ApiModelProperty(value = "短息内容")
     private String content;
 
+    @ApiModelProperty(value = "是否开启")
+    private Integer isStatus;
+
     @ApiModelProperty(value = "添加时间")
     private Date createTime;
 
@@ -57,4 +60,6 @@ public class MerchantSmsTemplate implements Serializable {
     private Date lastUpdateTime;
 
 
+
+
 }

crmeb-common/src/main/java/com/zbkj/common/model/user/UserBypassAccount.java

@@ -60,4 +60,7 @@ public class UserBypassAccount implements Serializable {
 
     @ApiModelProperty(value = "部门")
     private String department;
+
+    @ApiModelProperty(value = "是否查看主账号所有订单 1是 2否")
+    private Integer isAllOrders;
 }

crmeb-front/src/main/java/com/zbkj/front/controller/NewFrontApi.java

@@ -1,6 +1,7 @@
 package com.zbkj.front.controller;
 
 
+import cn.hutool.json.JSON;
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
@@ -339,19 +340,34 @@ public class NewFrontApi {
 
     @ApiOperation(value = "获取小程序码")
     @RequestMapping(value = "/getwxacode", method = RequestMethod.POST)
-    public CommonResult<String> getwxacode(@RequestBody @Validated GetwxacodeRequest getwxacodeRequest) {
+    public JSONObject getwxacode(@RequestBody @Validated GetwxacodeRequest getwxacodeRequest) {
         String image = aaaService.getImage(getwxacodeRequest);
-        return CommonResult.success(image);
+        JSONObject jsonObject = new JSONObject();
+        JSONObject jsonObject1 = new JSONObject();
+        if (StringUtils.isNotBlank(image)){
+            String image1 = image.substring(0, image.indexOf("shareId"));
+            String str2 = image.substring(image1.length()+7, image.length());
+            jsonObject.put("shareId",str2);
+            jsonObject1.put("data",jsonObject);
+            jsonObject1.put("message",image1);
+            jsonObject1.put("code",200);
+        }else{
+            jsonObject1.put("data",null);
+            jsonObject1.put("message","请求失败");
+            jsonObject1.put("code",500);
+
+        }
+        return jsonObject1;
     }
 
     @ApiOperation(value = "获取购物车信息（分享完购物车后用的）ids 为购物车表id")
     @RequestMapping(value = "/getwxacode1", method = RequestMethod.GET)
     public CommonResult<List<CartMerchantResponse>> getwxacode1(@RequestParam(name = "jsonIds") String jsonIds) {
         try {
-            List<Integer> ids = Arrays.stream(jsonIds.split(","))
-                    .map(Integer::parseInt)
-                    .collect(Collectors.toList());
-            List<CartMerchantResponse> list2 = cartService.getList2(ids);
+//            List<Integer> ids = Arrays.stream(jsonIds.split(","))
+//                    .map(Integer::parseInt)
+//                    .collect(Collectors.toList());
+            List<CartMerchantResponse> list2 = cartService.getList2(jsonIds);
             return CommonResult.success(list2);
         } catch (Exception e) {
             e.printStackTrace();

crmeb-front/src/main/java/com/zbkj/front/service/impl/AAAServiceImpl.java

@@ -37,10 +37,7 @@ import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
+import java.util.*;
 
 
 @Service
@@ -75,21 +72,19 @@ public class AAAServiceImpl implements AAAService {
         String cartIdString = scene.substring(0, scene.indexOf("&"));
         String substring = cartIdString.substring(cartIdString.indexOf("=")+1);
         String[] cartIds = substring.split(",");
-        LambdaQueryWrapper<CartShare> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(CartShare::getId,cartIds);
 
-        List<CartShare> cartShareList = cartShareService.list(queryWrapper);
-        for (CartShare cartShare : cartShareList) {
+        LambdaQueryWrapper<Cart> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(Cart::getId,cartIds);
+
+        List<Cart> cartList = cartService.list(queryWrapper);
+        String shareId= UUID.randomUUID().toString().replace("-","");
+        for (Cart cart : cartList) {
+            CartShare cartShare = new CartShare();
+            BeanUtils.copyProperties(cart,cartShare);
             cartShare.setStartTime(new Date());
+            cartShare.setShareId(shareId);
+            cartShareService.save(cartShare);
         }
-
-
-
-        cartShareService.updateBatchById(cartShareList);
-
-
-
-
         File outputFile = new File(fileNmaes);
 
 //        if (!isValidAccessToken()) {
@@ -116,7 +111,7 @@ public class AAAServiceImpl implements AAAService {
             conn.setRequestProperty("Content-Type", "application/json; charset=UTF-8");
 
             // 构造请求体
-            String jsonRequest = "{\"scene\":\"" + scene + "\",\"env_version\":\"" + env_version + "\", \"page\":\"" + page + "\"}";
+            String jsonRequest = "{\"scene\":\"" + scene + "\",\"shareId\":\"" + shareId + "\",\"env_version\":\"" + env_version + "\", \"page\":\"" + page + "\"}";
 
             OutputStream output = conn.getOutputStream();
             output.write(jsonRequest.getBytes("UTF-8"));
@@ -133,19 +128,19 @@ public class AAAServiceImpl implements AAAService {
                     FileOutputStream fos = new FileOutputStream(outputFile);
                     fos.write(qrCodeData);
                     fos.close();
-                    return fileNmae;
+                    return fileNmae+"shareId"+shareId;
                 } else if (contentType.startsWith("application/json")) {
                     // 返回的是错误信息，读取错误信息
                     InputStream input = conn.getInputStream();  // 修改这里
                     String errorMessage = IOUtils.toString(input, StandardCharsets.UTF_8);
-                    return errorMessage;
+                    return errorMessage+"shareId"+shareId;
                 }
             } else {
                 // 请求失败，读取错误信息
                 InputStream input = conn.getErrorStream();
                 if (input != null) {  // 额外的 null 检查
                     String errorMessage = IOUtils.toString(input, StandardCharsets.UTF_8);
-                    return errorMessage;
+                    return errorMessage+"shareId"+shareId;
                 }
             }
         } catch (IOException e) {

crmeb-service/src/main/java/com/zbkj/service/dao/CartShareDao.java

@@ -3,6 +3,7 @@ package com.zbkj.service.dao;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zbkj.common.model.cat.Cart;
 import com.zbkj.common.model.cat.CartShare;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -17,4 +18,5 @@ import java.util.List;
 public interface CartShareDao extends BaseMapper<CartShare> {
 
 
+    void cartShareId(@Param("cartShareId") String cartShareId,@Param("isInvalid") Integer isInvalid);
 }

crmeb-service/src/main/java/com/zbkj/service/service/CartService.java

@@ -24,7 +24,7 @@ public interface CartService extends IService<Cart> {
      */
     List<CartMerchantResponse> getList(boolean isValid);
 
-    List<CartMerchantResponse> getList2(List<Integer> ids);
+    List<CartMerchantResponse> getList2(String ids);
 
     /**
      * 获取当前购物车数量

crmeb-service/src/main/java/com/zbkj/service/service/CartShareService.java

@@ -18,5 +18,5 @@ import java.util.Map;
 public interface CartShareService extends IService<CartShare> {
 
 
-
+    void updateByShareId(String cartShareId,Integer isInvalid );
 }

crmeb-service/src/main/java/com/zbkj/service/service/impl/CartServiceImpl.java

@@ -131,13 +131,13 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
     }
 
     @Override
-    public List<CartMerchantResponse> getList2(List<Integer> ids) {
+    public List<CartMerchantResponse> getList2(String ids) {
         Integer userId = userService.getUserIdException();
         //带 StoreCart 类的多条件查询
         LambdaQueryWrapper<CartShare> lqw = new LambdaQueryWrapper<>();
 //        lqw.eq(Cart::getUid, userId);
 //        lqw.eq(Cart::getStatus, isValid);
-        lqw.in(CartShare::getId, ids);
+        lqw.eq(CartShare::getShareId, ids);
         lqw.orderByDesc(CartShare::getId);
         List<CartShare> cartList = cartShareDao.selectList(lqw);
         for (CartShare cartShare : cartList) {
@@ -157,7 +157,7 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
             } else {
                 cartShare.setIsInvalid(1);
             }
-            cartShareDao.updateById(cartShare);
+            cartShareService.updateByShareId(cartShare.getShareId(),cartShare.getIsInvalid());
         }
 
         if (CollUtil.isEmpty(cartList)) {
@@ -282,10 +282,10 @@ public class CartServiceImpl extends ServiceImpl<CartDao, Cart> implements CartS
                 storeCart.setMerId(product.getMerId());
                 if (dao.insert(storeCart) <= 0) throw new CrmebException("添加购物车失败");
 
-                CartShare storeCartShare = new CartShare();
-                BeanUtils.copyProperties(storeCart, storeCartShare);
-                storeCartShare.setCartNum(storeCart.getCartNum());
-                if (cartShareDao.insert(storeCartShare) <= 0) throw new CrmebException("添加购物车分享失败");
+//                CartShare storeCartShare = new CartShare();
+//                BeanUtils.copyProperties(storeCart, storeCartShare);
+//                storeCartShare.setCartNum(storeCart.getCartNum());
+//                if (cartShareDao.insert(storeCartShare) <= 0) throw new CrmebException("添加购物车分享失败");
             }
 
             return Boolean.TRUE;

crmeb-service/src/main/java/com/zbkj/service/service/impl/CartShareServiceImpl.java

@@ -47,6 +47,12 @@ import java.util.stream.Collectors;
 @Service
 public class CartShareServiceImpl extends ServiceImpl<CartShareDao, CartShare> implements CartShareService {
 
+    @Autowired
+    private CartShareDao cartShareDao;
 
+    @Override
+    public void updateByShareId(String cartShareId,Integer isInvalid) {
+        cartShareDao.cartShareId(cartShareId,isInvalid);
+    }
 }
 

crmeb-service/src/main/java/com/zbkj/service/service/impl/OnePassSmsServiceImpl.java

@@ -193,6 +193,11 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
         one.setUpdateTime(new Date());
         one.setTransmissionTimesThen(one.getTransmissionTimesThen() + a);
         merchantSmsService.updateById(one);
+        MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.selectByTempId(String.valueOf(tempId));
+        if(null!=merchantSmsTemplate){
+            merchantSmsTemplate.setLastUpdateTime(new Date());
+            merchantSmsTemplateService.updateById(merchantSmsTemplate);
+        }
 
         return one;
     }
@@ -230,6 +235,11 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
                 one.setTransmissionTimes(one.getTransmissionTimes() - a);
                 one.setTransmissionTimesThen(one.getTransmissionTimesThen() + a);
                 merchantSmsService.updateById(one);
+                MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.selectByTempId(String.valueOf(tempId));
+                if(null!=merchantSmsTemplate){
+                    merchantSmsTemplate.setLastUpdateTime(new Date());
+                    merchantSmsTemplateService.updateById(merchantSmsTemplate);
+                }
 
                 return true;
             }
@@ -258,6 +268,11 @@ public class OnePassSmsServiceImpl implements OnePassSmsService, SmsService {
                 one.setTransmissionTimes(one.getTransmissionTimes() - a);
                 one.setTransmissionTimesThen(one.getTransmissionTimesThen() + a);
                 merchantSmsService.updateById(one);
+                MerchantSmsTemplate merchantSmsTemplate = merchantSmsTemplateService.selectByTempId(String.valueOf(tempId));
+                if(null!=merchantSmsTemplate){
+                    merchantSmsTemplate.setLastUpdateTime(new Date());
+                    merchantSmsTemplateService.updateById(merchantSmsTemplate);
+                }
             }
 
 

crmeb-service/src/main/resources/mapper/cat/CartShareMapper.xml

@@ -2,5 +2,9 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.zbkj.service.dao.CartShareDao">
 
-
+<update id="cartShareId">
+            UPDATE `crmebjava`.`eb_cart_share`
+                SET `is_invalid` = #{isInvalid}
+            where`share_id` = #{cartShareId}
+    </update>
 </mapper>