111

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

@@ -168,7 +168,6 @@ public class NewPlatformApi {
             userEnterprise.setAvailableLineOfCredit(BigDecimal.valueOf(0));
             userEnterprise.setIsAuthentication(1);
             userEnterprise.setCreateTime(new Date());
-            userEnterprise.setIsAllOrder(1);
             userEnterpriseService.save(userEnterprise);
 
             //修改用户表字段

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

@@ -1,5 +1,6 @@
 package com.zbkj.admin.controller.platform;
 
+import com.zbkj.common.model.admin.SystemAdmin;
 import com.zbkj.common.page.CommonPage;
 import com.zbkj.common.request.OrderSearchRequest;
 import com.zbkj.common.request.PageParamRequest;
@@ -8,10 +9,12 @@ import com.zbkj.common.response.OrderInvoiceResponse;
 import com.zbkj.common.response.PlatformOrderAdminDetailResponse;
 import com.zbkj.common.response.PlatformOrderPageResponse;
 import com.zbkj.common.result.CommonResult;
+import com.zbkj.common.utils.SecurityUtil;
 import com.zbkj.common.vo.LogisticsResultVo;
 import com.zbkj.service.service.OrderService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.models.auth.In;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -37,6 +40,8 @@ public class PlatformOrderController {
     @ApiOperation(value = "平台端订单分页列表") //配合swagger使用
     @RequestMapping(value = "/list", method = RequestMethod.GET)
     public CommonResult<CommonPage<PlatformOrderPageResponse>> getList(@Validated OrderSearchRequest request, @Validated PageParamRequest pageParamRequest) {
+
+
         return CommonResult.success(CommonPage.restPage(orderService.getPlatformAdminPage(request, pageParamRequest)));
     }
 

crmeb-common/src/main/java/com/zbkj/common/model/admin/SystemAdmin.java

@@ -80,6 +80,4 @@ public class SystemAdmin implements Serializable {
 
     @ApiModelProperty(value = "后台管理员最后一次登录时间")
     private Date updateTime;
-
-
 }

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

@@ -75,7 +75,4 @@ public class UserEnterprise implements Serializable {
 
     @ApiModelProperty(value = "是否已经删除0 正常  1删除")
     private Integer isDelete;
-
-    @ApiModelProperty(value = "是否可以查询全部订单 0 否  1是")
-    private Integer isAllOrder;
 }

crmeb-common/src/main/java/com/zbkj/common/response/UserResponse.java

@@ -90,7 +90,4 @@ public class UserResponse {
 
     @ApiModelProperty(value = "是否是企业用户 1和null是普通用户，2是企业主用户 3是企业子用户")
     private Integer isEnterpriseUser;
-
-    @ApiModelProperty(value = "是否可以查询全部订单 0 否  1是")
-    private Integer isAllOrder;
 }

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

@@ -50,7 +50,6 @@ import java.util.stream.Collectors;
 
 /**
  * OrderServiceImpl 接口实现
-
  */
 @Service
 public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements OrderService {
@@ -176,18 +175,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         return CommonPage.copyPageInfo(page, orderList);
     }
 
-    public PageInfo<Order> getUserOrderList2(Integer isRemit,Integer userId, Integer status, PageParamRequest pageRequest,
-                                             List<Integer> ids,Integer id) {
+    public PageInfo<Order> getUserOrderList2(Integer isRemit, Integer userId, Integer status, PageParamRequest pageRequest,
+                                             List<Integer> ids, Integer id) {
         Page<Order> page = PageHelper.startPage(pageRequest.getPage(), pageRequest.getLimit());
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
 //        lqw.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral);
         lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
         lqw.and(i -> i.eq(Order::getQyId, id).or().isNull(Order::getQyId));
         lqw.in(Order::getUid, ids);
-        if (1==isRemit){
+        if (1 == isRemit) {
             lqw.eq(Order::getIsRemit, isRemit);
         }
-        if (null==isRemit||2==isRemit){
+        if (null == isRemit || 2 == isRemit) {
             lqw.notIn(Order::getIsRemit, 1);
         }
 
@@ -213,7 +212,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         return CommonPage.copyPageInfo(page, orderList);
     }
 
-    public PageInfo<Order> getUserOrderList3(Integer userId, Integer status, PageParamRequest pageRequest,List<Integer> ids,Integer id) {
+    public PageInfo<Order> getUserOrderList3(Integer userId, Integer status, PageParamRequest pageRequest, List<Integer> ids, Integer id) {
         Page<Order> page = PageHelper.startPage(pageRequest.getPage(), pageRequest.getLimit());
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
         lqw.in(Order::getUid, ids);
@@ -257,6 +256,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         List<Order> orderList = dao.selectList(lqw);
         return CommonPage.copyPageInfo(page, orderList);
     }
+
     /**
      * 取消订单
      *
@@ -296,13 +296,13 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 //        lqw.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral);
         lqw.and(i -> i.ne(Order::getIsIntegral, 1).or().isNull(Order::getIsIntegral));
         if (StrUtil.isNotBlank(request.getPayType())) {
-            if (request.getPayType().equals( "xyed" )){
+            if (request.getPayType().equals("xyed")) {
                 lqw.like(Order::getPayType, "信用额度");
             }
-            if (request.getPayType().equals( "wx" )){
+            if (request.getPayType().equals("wx")) {
                 lqw.like(Order::getPayType, "weixin");
             }
-            if (request.getPayType().equals( "yue" )){
+            if (request.getPayType().equals("yue")) {
                 lqw.like(Order::getPayType, "yue");
             }
         }
@@ -341,7 +341,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
             pageResponse.setIsRemit(e.getIsRemit());
 //            if (e.getIsLineOfCredit()!=null){
 //                if (e.getIsLineOfCredit()==1){
-                //换个判断
+            //换个判断
 //                if (e.getPayType().equals( "信用额度" )){
 //                    UserEnterprise one = new UserEnterprise();
 //                    LambdaQueryWrapper<UserEnterprise> queryWrapper = new LambdaQueryWrapper<>();
@@ -367,9 +367,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         }).collect(Collectors.toList());
         return CommonPage.copyPageInfo(startPage, pageResponses);
     }
+
     @Override
     public PageInfo<MerchantOrder2PageResponse> getMerchantAdminPage2(OrderSearchRequest request,
-                                                                     PageParamRequest pageParamRequest) {
+                                                                      PageParamRequest pageParamRequest) {
         SystemAdmin systemAdmin = SecurityUtil.getLoginUserVo().getUser();
 
         Page<Order> startPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
@@ -411,6 +412,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         }).collect(Collectors.toList());
         return CommonPage.copyPageInfo(startPage, pageResponses);
     }
+
     /**
      * 获取商户端订单各状态数量
      *
@@ -614,6 +616,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         if (ObjectUtil.isNotNull(request.getType())) {
             lqw.eq(Order::getType, request.getType());
         }
+
+
         if (StrUtil.isNotEmpty(request.getDateLimit())) {
             getRequestTimeWhere(lqw, request.getDateLimit());
         }
@@ -899,13 +903,14 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 获取订单数量（订单状态， 用户id）
+     *
      * @param status 订单状态（0：待支付，1：待发货,2：部分发货， 3：待核销，4：待收货,5：已收货,6：已完成，9：已取消）
      * @param userId 用户ID
      * @return 订单数量
      */
     @Override
     public Integer getCountByStatusAndUid(Integer status, Integer userId) {
-        if (status < 0 ) {
+        if (status < 0) {
             return 0;
         }
         LambdaQueryWrapper<Order> lqw = Wrappers.lambdaQuery();
@@ -923,6 +928,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 通过日期获取支付订单数量
+     *
      * @param date 日期，yyyy-MM-dd格式
      * @return Integer
      */
@@ -938,6 +944,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 获取推广订单总金额
+     *
      * @param orderNoList 订单编号列表
      * @return BigDecimal
      */
@@ -952,6 +959,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 订单拆单删除
+     *
      * @param orderNo 订单号
      */
     @Override
@@ -965,6 +973,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 通过原始单号获取订单列表
+     *
      * @param orderNo 原始单号
      * @return 订单列表
      */
@@ -978,6 +987,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
     /**
      * 判断用户是否存在待处理订单
      * 待发货、部分发货、待核销
+     *
      * @param uid 用户id
      */
     @Override
@@ -995,6 +1005,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 获取待收货订单
+     *
      * @param sendTime 发货时间
      * @return List
      */
@@ -1010,6 +1021,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 获取待发货订单数量
+     *
      * @return Integer
      */
     @Override
@@ -1019,6 +1031,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 获取待核销订单数量
+     *
      * @return Integer
      */
     @Override
@@ -1028,16 +1041,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
 
     /**
      * 获取用户购买的商品数量
-     * @param uid 用户ID
-     * @param proId 商品ID
+     *
+     * @param uid         用户ID
+     * @param proId       商品ID
      * @param productType 商品类型
      */
     @Override
     public Integer getProductNumCount(Integer uid, Integer proId, Integer productType) {
         return dao.getProductNumCount(uid, proId, productType);
     }
+
     @Override
-    public PageInfo<User> getPhoneList(Integer merId,PageParamRequest pageParamRequest) {
+    public PageInfo<User> getPhoneList(Integer merId, PageParamRequest pageParamRequest) {
         Page<Order> orderPage = PageHelper.startPage(pageParamRequest.getPage(), pageParamRequest.getLimit());
 
         List<Integer> orderUid = orderDao.getPhoneList(merId);
@@ -1063,10 +1078,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         PageInfo<User> userPageInfo = CommonPage.copyPageInfo(orderPage, UserList);
         return userPageInfo;
     }
+
     @Override
     public List<Integer> getOrderUid() {
         return dao.getOrderUid();
     }
+
     /**
      * 根据订单编号获取订单
      *
@@ -1436,7 +1453,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
         if (order.getPayChannel().equals(PayConstants.PAY_CHANNEL_WECHAT_PUBLIC) && notification.getIsWechat().equals(1)) {
             userToken = userTokenService.getTokenByUserId(order.getUid(), UserConstants.USER_TOKEN_TYPE_WECHAT);
             if (ObjectUtil.isNull(userToken)) {
-                return ;
+                return;
             }
             /**
              * {{first.DATA}}
@@ -1458,7 +1475,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderDao, Order> implements Or
             // 小程序发送订阅消息
             userToken = userTokenService.getTokenByUserId(order.getUid(), UserConstants.USER_TOKEN_TYPE_ROUTINE);
             if (ObjectUtil.isNull(userToken)) {
-                return ;
+                return;
             }
             // 组装数据
             // 注释部分为丰享汇小程序

crmeb-service/src/main/resources/mapper/system/TaskMessageMapper.xml

@@ -3,6 +3,6 @@
 <mapper namespace="com.zbkj.service.dao.TaskMessageDao">
 
 <select id="getMerByMerId" parameterType="java.lang.Integer" resultType="com.zbkj.common.model.system.TaskMessage">
-    select * from eb_task_message where is_message='0'vand  mer_id =#{merId}
+    select * from eb_task_message where is_message='0' and  mer_id =#{merId}
     </select>
 </mapper>