Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

2024-10-17 17:35:36 +08:00 · 2024-10-17 17:35:36 +08:00 · 309b6484c9
commit 309b6484c9
parent 99846979fd d7c1ac245d
9 changed files with 33 additions and 12 deletions
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/inspection/controller/InspectionMallPartnersController.java
@ -13,6 +13,8 @@ import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
 import cn.iocoder.yudao.module.core.text.Convert;
 import cn.iocoder.yudao.module.core.text.ServletUtils;
 import cn.iocoder.yudao.module.label.vo.LabelRespVO;
+import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
+import cn.iocoder.yudao.module.partner.service.IPartnerCustomerInfoService;
 import cn.iocoder.yudao.module.partner.service.IPartnerWorkerService;
 import cn.iocoder.yudao.module.payment.service.OrderInfoService;
 import cn.iocoder.yudao.module.system.dal.dataobject.dict.DictDataDO;
@ -57,6 +59,8 @@ public class InspectionMallPartnersController extends BaseController {
    private PermissionService permissionService;
    @Autowired
    private RoleService roleService;
+    @Autowired
+    private IPartnerCustomerInfoService partnerCustomerInfoService;

    /**
     * 查询合作商管理列表
@ -128,6 +132,8 @@ public class InspectionMallPartnersController extends BaseController {
        return CommonResult.success(list);
    }

+
+
    @GetMapping("/delWorkOrder")
    public CommonResult<IPage<?>> delWorkOrder(String carNum,String goodsTitle,String customerSource,String payType,String startTime,Long roleId,String endTime,Integer pageSize,Integer pageNum)
    {
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/controller/PartnerCustomerInfoController.java
@ -2,14 +2,9 @@ package cn.iocoder.yudao.module.partner.controller;

 import cn.iocoder.yudao.framework.common.pojo.CommonResult;
 import cn.iocoder.yudao.module.core.controller.BaseController;
-import cn.iocoder.yudao.module.core.page.TableDataInfo;
-import cn.iocoder.yudao.module.core.text.Convert;
-import cn.iocoder.yudao.module.core.text.ServletUtils;
 import cn.iocoder.yudao.module.inspection.service.AppInspectionPartnerService;
-import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
 import cn.iocoder.yudao.module.partner.service.IPartnerCustomerInfoService;
-import cn.iocoder.yudao.module.shop.entity.ShopMallPartners;
 import cn.iocoder.yudao.util.ExcelUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -18,8 +13,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;

-import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
-
 /**
 * 客户信息Controller
 *
@ -51,6 +44,7 @@ public class PartnerCustomerInfoController extends BaseController
 //        return getDataTable(list);
    }

+
    /**
     * 导出客户信息列表
     */
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/entity/PartnerCustomerInfo.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/entity/PartnerCustomerInfo.java
@ -43,6 +43,7 @@ public class PartnerCustomerInfo extends TenantBaseDO
    @Excel(name = "性别")
    private String sex;

+
    /** 年龄 */
    @Excel(name = "年龄")
    private Integer userAge;
@ -57,5 +58,7 @@ public class PartnerCustomerInfo extends TenantBaseDO
    private String roleCode;
    @TableField(exist = false)
    private String roleName;
+    @TableField(exist = false)
+    private int orderCount;

 }
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/mapper/PartnerCustomerInfoMapper.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/mapper/PartnerCustomerInfoMapper.java
@ -1,8 +1,6 @@
 package cn.iocoder.yudao.module.partner.mapper;


-import cn.iocoder.yudao.module.label.vo.LabelPageReqVO;
-import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@ -56,4 +54,6 @@ public interface PartnerCustomerInfoMapper extends BaseMapper<PartnerCustomerInf
     * @return 结果
     */
    public int deletePartnerCustomerInfoByIds(Long[] ids);
+
+
 }
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/IPartnerCustomerInfoService.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/IPartnerCustomerInfoService.java
@ -1,7 +1,5 @@
 package cn.iocoder.yudao.module.partner.service;

-import cn.iocoder.yudao.module.label.vo.LabelPageReqVO;
-import cn.iocoder.yudao.module.label.vo.LabelRespVO;
 import cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@ -60,4 +58,7 @@ public interface IPartnerCustomerInfoService extends IService<PartnerCustomerInf
     */
    public int deletePartnerCustomerInfoByIds(Long[] ids);

+
+
+
 }
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/partner/service/impl/PartnerCustomerInfoServiceImpl.java
@ -53,6 +53,8 @@ public class PartnerCustomerInfoServiceImpl extends ServiceImpl<PartnerCustomerI
    private PermissionService permissionService;
    @Resource
    private PartnerCustomerInfoMapper customerInfoMapper;
+    @Autowired
+    private PartnerCustomerInfoMapper partnerCustomerInfoMapper;

    /**
     * 查询客户信息列表
@ -241,4 +243,8 @@ public class PartnerCustomerInfoServiceImpl extends ServiceImpl<PartnerCustomerI
    {
        return baseMapper.deletePartnerCustomerInfoByIds(ids);
    }
+
+
+
+
 }
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/OrderInfoService.java
@ -10,6 +10,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import org.springframework.data.repository.query.Param;

 import java.util.List;
 import java.util.Map;
@ -48,6 +49,9 @@ public interface OrderInfoService extends IService<OrderInfo> {
     **/
    IPage<OrderInfo> queryListPage(OrderInfo orderInfo, Page<OrderInfo> page);

+
+
+
    Long createOrder(OrderInfo orderInfo) throws Exception;

    JSONObject pickCarDetail(Long pickCarId);
--- a/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java
+++ b/dl-module-inspection/src/main/java/cn/iocoder/yudao/module/payment/service/impl/OrderInfoServiceImpl.java
@ -181,6 +181,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
        return baseMapper.pageOrderListSystem(orderInfo,page);
    }

+
    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createOrder(OrderInfo orderInfo) throws Exception {
--- a/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml
+++ b/dl-module-inspection/src/main/resources/mapper/partner/PartnerCustomerInfoMapper.xml
@ -50,12 +50,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            resultType="cn.iocoder.yudao.module.partner.entity.PartnerCustomerInfo">
        select pci.*,
        sr.name as roleName,
-        sr.code as roleCode
+        sr.code as roleCode,
+        COUNT(ins.id) AS orderCount
        from partner_customer_info pci
        left join shop_user_car suc on suc.user_id = pci.user_id
        left join system_users su on su.id = pci.user_id
        left join system_user_role sur on sur.user_id = su.id
        left join system_role sr on sr.id = sur.role_id
+        LEFT JOIN inspection_info ins ON ins.user_id = pci.user_id AND YEAR(ins.create_time) =YEAR(NOW())
        <where>
            <if test="vo.carNum != null  and vo.carNum != ''"> and suc.car_no like concat('%', #{vo.carNum}, '%')</if>
            <if test="vo.customerName != null  and vo.customerName != ''"> and pci.customer_name like concat('%', #{vo.customerName}, '%')</if>
@ -126,4 +128,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
            #{id}
        </foreach>
    </delete>
+
+
+
+
 </mapper>