Merge remote-tracking branch 'origin/master'

# Conflicts:
#	fs-company/src/main/java/com/fs/crm/controller/CrmCustomerController.java
#	fs-service-system/src/main/java/com/fs/crm/service/ICrmCustomerService.java
#	fs-service-system/src/main/java/com/fs/crm/service/impl/CrmCustomerServiceImpl.java

fs-admin/src/main/java/com/fs/course/controller/FsCourseWatchCommentController.java

@@ -38,7 +38,7 @@ public class FsCourseWatchCommentController extends BaseController
     /**
      * 查询看课评论列表
      */
-    @PreAuthorize("@ss.hasPermi('course:courseWatchComment:list')")
+
     @GetMapping("/list")
     public R list(FsCourseWatchCommentPageParam fsCourseWatchCommentPageParam)
     {

fs-admin/src/main/java/com/fs/course/controller/FsUserCourseVideoController.java

@@ -81,9 +81,9 @@ public class FsUserCourseVideoController extends BaseController
     @GetMapping(value = "/{videoId}")
     public AjaxResult getInfo(@PathVariable("videoId") Long videoId)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        Long userId = loginUser.getUser().getUserId();
-        return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId,userId));
+//        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+//        Long userId = loginUser.getUser().getUserId();
+        return AjaxResult.success(fsUserCourseVideoService.selectFsUserCourseVideoByVideoIdVO(videoId));
     }
 
     /**

fs-admin/src/main/java/com/fs/course/controller/FsUserWatchCourseStatisticsController.java

@@ -105,6 +105,18 @@ public class FsUserWatchCourseStatisticsController extends BaseController
         return toAjax(fsUserWatchCourseStatisticsService.deleteFsUserWatchCourseStatisticsByIds(ids));
     }
 
+    /**
+     * 查询会员观看数据明细汇总
+     */
+    @PreAuthorize("@ss.hasPermi('course:userWatchCourseStatistics:listTotal')")
+    @GetMapping("/listTotal")
+    public TableDataInfo listTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
+    {
+        startPage();
+        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
+        return getDataTable(list);
+    }
+
     /**
      * 导出会员看课统计-按课程汇总统计列表
      */
@@ -112,7 +124,7 @@ public class FsUserWatchCourseStatisticsController extends BaseController
     @GetMapping("/exportTotal")
     public AjaxResult exportTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
     {
-        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
+        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
         List<FsUserWatchCourseStatisticsExportVO> listVO = list.stream().map(v -> {
             FsUserWatchCourseStatisticsExportVO vo = new FsUserWatchCourseStatisticsExportVO();
             BeanUtils.copyProperties(v, vo);

fs-admin/src/main/java/com/fs/crm/controller/CrmCustomerController.java

@@ -1,35 +1,35 @@
 package com.fs.crm.controller;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.OrderUtils;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
+import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
 import com.fs.company.service.ICompanyService;
 import com.fs.core.security.LoginUser;
 import com.fs.core.web.service.TokenService;
+import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.param.*;
-import com.fs.crm.vo.CrmCustomerListVO;
+import com.fs.crm.service.ICrmCustomerService;
 import com.fs.crm.vo.CrmCustomerExportVO;
-import com.fs.store.vo.FsStoreOrderVO;
+import com.fs.crm.vo.CrmCustomerListVO;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.BeanUtils;
-import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
-import com.fs.common.annotation.Log;
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.enums.BusinessType;
-import com.fs.crm.domain.CrmCustomer;
-import com.fs.crm.service.ICrmCustomerService;
-import com.fs.common.utils.poi.ExcelUtil;
-import com.fs.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * 客户Controller
  *
@@ -282,5 +282,12 @@ public class CrmCustomerController extends BaseController
         return R.ok().put("data",customerList);
     }
 
+    @ApiOperation("置顶切换")
+    @PreAuthorize("@ss.hasPermi('crm:customer:switchToTop')")
+    @PostMapping("/switchToTop/{customerId}")
+    public R switchToTop(@PathVariable Long customerId) {
+        crmCustomerService.switchToTop(customerId);
+        return R.ok();
+    }
 
 }

fs-admin/src/main/java/com/fs/crm/controller/CrmCustomerLevelController.java

@@ -0,0 +1,84 @@
+package com.fs.crm.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fs.common.annotation.Log;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.AjaxResult;
+import com.fs.common.core.domain.R;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.crm.domain.CrmCustomerLevel;
+import com.fs.crm.param.CrmCustomerLevelParm;
+import com.fs.crm.param.CrmCustomerLevelQueryParam;
+import com.fs.crm.service.ICrmCustomerLevelService;
+import com.fs.crm.vo.CrmCustomerLevelVO;
+import com.fs.his.vo.OptionsVO;
+import lombok.AllArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/crm/customerLevel")
+@AllArgsConstructor
+public class CrmCustomerLevelController extends BaseController {
+
+    private final ICrmCustomerLevelService customerLevelService;
+
+    @PreAuthorize("@ss.hasPermi('crm:customerLevel:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(CrmCustomerLevelQueryParam param) {
+        startPage();
+        List<CrmCustomerLevelVO> list = customerLevelService.selectCrmCustomerLevelVOList(param);
+        return getDataTable(list);
+    }
+
+    @PreAuthorize("@ss.hasPermi('crm:customerLevel:add')")
+    @Log(title = "客户级别", businessType = BusinessType.INSERT)
+    @PostMapping("/add")
+    public AjaxResult add(@Valid @RequestBody CrmCustomerLevelParm param) {
+        return toAjax(customerLevelService.saveCustomerLevel(param));
+    }
+
+    @PreAuthorize("@ss.hasPermi('crm:customerLevel:edit')")
+    @Log(title = "客户级别", businessType = BusinessType.UPDATE)
+    @PutMapping("/edit")
+    public AjaxResult edit(@Valid @RequestBody CrmCustomerLevelParm param) {
+        return toAjax(customerLevelService.editCustomerLevel(param));
+    }
+
+    @PreAuthorize("@ss.hasPermi('crm:customerLevel:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable Long id) {
+        return AjaxResult.success(customerLevelService.selectCrmCustomerLevelVOById(id));
+    }
+
+    @PreAuthorize("@ss.hasPermi('crm:customerLevel:delete')")
+    @Log(title = "客户", businessType = BusinessType.DELETE)
+    @DeleteMapping("/delete/{ids}")
+    public AjaxResult delete(@PathVariable Long[] ids) {
+        customerLevelService.removeByIds(Arrays.asList(ids));
+        return AjaxResult.success();
+    }
+
+    @GetMapping("/getCustomerLevelOption")
+    public R getCustomerLevelOption(Integer status) {
+        LambdaQueryWrapper<CrmCustomerLevel> wrapper = Wrappers.lambdaQuery();
+        if (Objects.nonNull(status)) {
+            wrapper.eq(CrmCustomerLevel::getStatus, status);
+        }
+        List<OptionsVO> options = customerLevelService.list(wrapper).stream().map(l -> {
+            OptionsVO vo = new OptionsVO();
+            vo.setDictLabel(l.getName());
+            vo.setDictValue(l.getId());
+            return vo;
+        }).collect(Collectors.toList());
+        return R.ok().put("data", options);
+    }
+}

fs-admin/src/main/java/com/fs/store/controller/FsUserController.java

@@ -160,7 +160,7 @@ public class FsUserController extends BaseController
     @ApiOperation("小黑屋")
     public R darkRoomList(FsUserPageListParam param) {
 //        startPage();
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
         for (FsUserPageListVO fsUserPageListVO : fsUserPageListVOPageInfo.getList()) {
             fsUserPageListVO.setPhone(ParseUtils.parsePhone(fsUserPageListVO.getPhone()));

fs-admin/src/main/java/com/fs/task/OrderTask.java

@@ -0,0 +1,19 @@
+package com.fs.task;
+
+import com.fs.company.service.CompanyRechargeOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component("orderTask")
+public class OrderTask {
+    @Autowired
+    private CompanyRechargeOrderService companyRechargeOrderService;
+
+
+    /**
+     * 自动关闭超时订单
+     */
+    public void autoCloseTimeOutOrder(){
+        companyRechargeOrderService.autoClosedOrder();
+    }
+}

fs-admin/src/main/java/com/fs/task/StoreTask.java

@@ -171,6 +171,14 @@ public class StoreTask
         }
     }
 
+    public void redPacketAddMoney() throws Exception
+    {
+        List<RedPacketMoneyVO> redPacketMoneyVOS = fsCourseRedPacketLogMapper.selectFsCourseAddRedPacketLogByCompany();
+        for (RedPacketMoneyVO redPacketMoneyVO : redPacketMoneyVOS) {
+            companyService.addRedPacketCompanyMoney(redPacketMoneyVO.getMoney(),redPacketMoneyVO.getCompanyId());
+        }
+    }
+
     //每5分钟执行一次
     public void deliveryOp()
     {

fs-admin/src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
   port: 7011
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+    active: druid-bly-test
+#    include: common,config-bly
 #    active: druid-fby
 #    include: common,config-fby

fs-admin/src/test/java/com/fs/course/controller/AdHtmlClickLogServiceImplTest.java

@@ -0,0 +1,19 @@
+package com.fs.course.controller;
+
+
+import com.fs.FSAdminApplication;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.math.BigDecimal;
+
+@RunWith(org.springframework.test.context.junit4.SpringRunner.class)
+@SpringBootTest(classes = FSAdminApplication.class)
+@Slf4j
+public class AdHtmlClickLogServiceImplTest {
+
+
+}

fs-admin/src/test/java/com/fs/course/controller/FsCourseDomainNameControllerTest.java

@@ -0,0 +1,78 @@
+package com.fs.course.controller;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.json.JSONUtil;
+import com.fs.FSAdminApplication;
+import com.fs.course.config.RedPacketConfig;
+import com.fs.system.service.ISysConfigService;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderV3Request;
+import com.github.binarywang.wxpay.bean.result.WxPayUnifiedOrderResult;
+import com.github.binarywang.wxpay.bean.result.enums.TradeTypeEnum;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.exception.WxPayException;
+import com.github.binarywang.wxpay.service.WxPayService;
+import lombok.extern.slf4j.Slf4j;
+import org.bouncycastle.cert.ocsp.Req;
+import org.junit.jupiter.api.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+@RunWith(org.springframework.test.context.junit4.SpringRunner.class)
+@SpringBootTest(classes = FSAdminApplication.class)
+@Slf4j
+class FsCourseDomainNameControllerTest {
+
+    @Autowired
+    private WxPayService wxPayService;
+
+    @Autowired
+    private ISysConfigService configService;
+    @Test
+    public void nativePay() throws WxPayException {
+
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId("wx961fadab9bcb792b");
+        payConfig.setMchId("1716217886");
+        payConfig.setMchKey("a7Fc5B9dE2h8J3kL4mN6pQ7rS9tU2vW1");
+        payConfig.setPrivateKeyPath("C:\\cert\\1716217886_20250509_cert\\apiclient_key.pem");
+        payConfig.setPrivateCertPath("C:\\cert\\1716217886_20250509_cert\\apiclient_cert.pem");
+        payConfig.setCertSerialNo("4E8BD68BC2BFD37CA58244D660E5FDCCE475D82E");
+        payConfig.setUseSandboxEnv(false);
+        payConfig.setSignType(WxPayConstants.SignType.HMAC_SHA256);
+
+        wxPayService.setConfig(payConfig);
+
+        // 构建支付请求参数
+        WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
+
+        // 设置商品描述
+        orderRequest.setBody("测试");
+        // 设置商户订单号
+        orderRequest.setOutTradeNo("20250621170609");
+        // 设置订单金额（单位：分）
+        orderRequest.setTotalFee(1);
+        // 设置终端IP
+        orderRequest.setSpbillCreateIp("127.0.0.1");
+        // 设置通知地址
+        orderRequest.setNotifyUrl("https://userapp.fbylive.com/app/wxpay/v3TransferNotify");
+        // 设置交易类型为NATIVE
+        orderRequest.setTradeType(WxPayConstants.TradeType.NATIVE);
+        orderRequest.setProductId("1");
+
+
+        Object order = wxPayService.createOrder(orderRequest);
+
+
+        log.info("请求结果: {}",order);
+    }
+
+}

fs-company-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -190,6 +190,7 @@ public class CompanyUserController extends AppBaseController {
         BeanUtils.copyProperties(param, companyUser);
 
         companyUser.setUserName(param.getPhoneNumber());
+        companyUser.setUserType("01");
         companyUser.setPhonenumber(param.getPhoneNumber());
         companyUser.setPassword(SecurityUtils.encryptPassword(companyUser.getPassword()));
         companyUser.setCreateTime(new Date());

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -42,11 +42,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
 import java.io.InputStream;
-import java.text.SimpleDateFormat;
+import java.text.ParseException;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 
 @Slf4j
@@ -81,7 +81,7 @@ public class FsUserController extends AppBaseController {
     @ApiOperation("用户会员分页列表")
     public ResponseResult<PageInfo<FsUserPageListVO>> pageList(@RequestBody FsUserPageListParam param) {
         param.setUserId(Long.parseLong(getUserId()));
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
 //        PageInfo<FsUserPageListVO> pageInfo = new PageInfo<>(list);
         return ResponseResult.ok(fsUserPageListVOPageInfo);
@@ -159,18 +159,23 @@ public class FsUserController extends AppBaseController {
     public ResponseResult<FsUserStatisticsVO> userStatistics(@ApiParam(value = "开始时间", required = true) @RequestParam String startTime,
                                                              @ApiParam(value = "结束时间", required = true) @RequestParam String endTime) {
         long userId = Long.parseLong(getUserId());
-        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-        String nowDate = dateFormat.format(new Date());
         /*---------- 如果传入的日期是今天 ----------*/
         UserStatisticsCommonParam param = new UserStatisticsCommonParam();
         param.setUserId(userId).setStartTime(startTime).setEndTime(endTime);
         FsUserStatisticsVO vo = fsUserService.userStatistics(param);
-        if (nowDate.compareTo(startTime) > 0 && nowDate.compareTo(endTime) < 0) {
+
+        DateTimeFormatter dfm = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDate today = LocalDate.now();
+        LocalDateTime startDateTime = LocalDateTime.parse(startTime, dfm);
+        LocalDateTime endDateTime = LocalDateTime.parse(endTime, dfm);
+        if (startDateTime.toLocalDate().equals(today) && endDateTime.toLocalDate().equals(today)) {
             String yesterday = LocalDate.now().minusDays(1).toString();
             UserStatisticsCommonParam paramYes = new UserStatisticsCommonParam();
             paramYes.setUserId(userId).setStartTime(yesterday + " 00:00:00").setEndTime(yesterday + " 23:59:59");
             FsUserStatisticsVO fsUserStatisticsVO = fsUserService.userStatistics(paramYes);
             vo.setYesterdayVO(fsUserStatisticsVO);
+        } else {
+            vo.setYesterdayVO(new FsUserStatisticsVO());
         }
         return ResponseResult.ok(vo);
     }

fs-company-app/src/main/java/com/fs/app/controller/FsUserCourseVideoController.java

@@ -5,6 +5,8 @@ import com.fs.app.config.ImageStorageConfig;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.domain.ResponseResult;
 import com.fs.common.utils.StringUtils;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.service.ICompanyUserService;
 import com.fs.course.domain.FsUserCoursePeriod;
 import com.fs.course.param.FsCourseLinkCreateParam;
 import com.fs.course.param.newfs.FsCourseSortLinkParam;
@@ -30,7 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.io.InputStream;
-import java.time.LocalDate;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -58,6 +59,8 @@ public class FsUserCourseVideoController extends AppBaseController {
 
     @Autowired
     private IFsUserCoursePeriodService fsUserCoursePeriodService;
+    @Autowired
+    private ICompanyUserService companyUserService;
 
     @Login
     @GetMapping("/pageList")
@@ -108,12 +111,23 @@ public class FsUserCourseVideoController extends AppBaseController {
                                                       @RequestParam(required = false) String keyword,
                                                       @RequestParam(required = false, defaultValue = "1") Integer pageNum,
                                                       @RequestParam(required = false, defaultValue = "10") Integer pageSize) {
-        log.debug("参与记录 keyword: {}, pageNum: {}, pageSize: {}", keyword, pageNum, pageSize);
+        log.debug("参与记录 videoId:{}, type:{}, keyword: {}, pageNum: {}, pageSize: {}", videoId, type, keyword, pageNum, pageSize);
         Map<String, Object> params = new HashMap<>();
         params.put("videoId", videoId);
         params.put("type", type);
         params.put("keyword", keyword);
 
+        // type 0 答题领奖记录----答题正确并且领取红包的
+        // type 1 完播----这堂课看完的人
+        // type 2 未完播---看课中断
+        // 管理员看整个公司 否则看自己的
+        CompanyUser companyUser = companyUserService.selectCompanyUserByUserId(Long.parseLong(getUserId()));
+        if (companyUser.isAdmin()) {
+            params.put("companyId", companyUser.getCompanyId());
+        } else {
+            params.put("companyUserId", companyUser.getUserId());
+        }
+
         PageHelper.startPage(pageNum, pageSize);
         List<FsUserCourseParticipationRecordVO> record = fsUserCourseService.getParticipationRecordByMap(params);
         return ResponseResult.ok(new PageInfo<>(record));
@@ -200,7 +214,7 @@ public class FsUserCourseVideoController extends AppBaseController {
 
         Map<String, Object> params = new HashMap<>();
         params.put("companyId", companyId);
-        params.put("dayDate", LocalDate.now());
+//        params.put("dayDate", LocalDate.now());
         params.put("companyUserId", Long.parseLong(getUserId()));
 
         PageHelper.startPage(pageNum, pageSize);

fs-company-app/src/main/resources/application.yml

@@ -4,7 +4,6 @@ server:
 
 spring:
   profiles:
-    active: dev
-    include: common,config-dev
+    active: druid-zkzh-test
 #    active: druid-fby
 #    include: common,config-fby

fs-company/src/main/java/com/fs/company/controller/CompanyController.java

@@ -7,6 +7,7 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanySms;
 import com.fs.company.domain.CompanyVoice;
+import com.fs.company.param.CompanyConfigParam;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.service.ICompanySmsService;
@@ -115,4 +116,13 @@ public class CompanyController extends BaseController
         return R.ok();
     }
 
+    @ApiOperation("其他配置")
+    @PostMapping(value = "/config")
+    public R configUserCheck(@RequestBody CompanyConfigParam param) {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        param.setCompany(loginUser.getCompany());
+        companyService.config(param);
+        return R.ok();
+    }
+
 }

fs-company/src/main/java/com/fs/company/controller/CompanyRechargeController.java

@@ -13,12 +13,15 @@ import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyRecharge;
+import com.fs.company.domain.CompanyRechargeOrder;
+import com.fs.company.dto.RechargeDTO;
 import com.fs.company.param.CompanyRechargeParam;
 import com.fs.company.service.ICompanyRechargeService;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyRechargeVO;
 import com.fs.core.security.LoginUser;
 import com.fs.core.web.service.TokenService;
+import com.tencentcloudapi.organization.v20181225.OrganizationErrorCode;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
@@ -75,6 +78,38 @@ public class CompanyRechargeController extends BaseController
     }
 
 
+    /**
+     * 充值
+     * @return AjaxResult
+     */
+    @PostMapping("/wxRecharge")
+    public AjaxResult recharge(@RequestBody RechargeDTO dto){
+        CompanyRechargeOrder companyRechargeOrder;
+        try {
+            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+
+            dto.setCompanyId(loginUser.getCompany().getCompanyId());
+            dto.setUserId(loginUser.getUser().getUserId());
+            companyRechargeOrder = companyRechargeService.recharge(dto);
+        }catch (Exception e) {
+            logger.error("给公司充值失败",e);
+            return AjaxResult.error(e.getMessage());
+        }
+        return AjaxResult.success(companyRechargeOrder);
+    }
+
+    /**
+     * 查询订单
+     * @param orderNo 订单号
+     * @return AjaxResult
+     */
+    @GetMapping("/queryOrder")
+    public AjaxResult queryOrder(@RequestParam("orderNo") String orderNo) {
+        CompanyRechargeOrder order = companyRechargeService.queryOrder(orderNo);
+
+        return AjaxResult.success(order);
+    }
+
 
     /**
      * 新增充值

fs-company/src/main/java/com/fs/course/controller/FsUserWatchCourseStatisticsController.java

@@ -54,10 +54,27 @@ public class FsUserWatchCourseStatisticsController extends BaseController
     @GetMapping("/export")
     public AjaxResult export(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
     {
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany().getCompanyId());
         List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
         ExcelUtil<FsUserWatchCourseStatistics> util = new ExcelUtil<FsUserWatchCourseStatistics>(FsUserWatchCourseStatistics.class);
         return util.exportExcel(list, "会员观看数据明细");
     }
+
+    /**
+     * 查询会员观看数据明细汇总
+     */
+    @PreAuthorize("@ss.hasPermi('course:userWatchCourseStatistics:listTotal')")
+    @GetMapping("/listTotal")
+    public TableDataInfo listTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
+    {
+        startPage();
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany().getCompanyId());
+        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
+        return getDataTable(list);
+    }
+
     /**
      * 导出会员看课统计-按课程汇总统计列表
      */
@@ -65,7 +82,9 @@ public class FsUserWatchCourseStatisticsController extends BaseController
     @GetMapping("/exportTotal")
     public AjaxResult exportTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
     {
-        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        fsUserWatchCourseStatistics.setCompanyId( loginUser.getCompany().getCompanyId());
+        List<FsUserWatchCourseStatistics> list = fsUserWatchCourseStatisticsService.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
         List<FsUserWatchCourseStatisticsExportVO> listVO = list.stream().map(v -> {
             FsUserWatchCourseStatisticsExportVO vo = new FsUserWatchCourseStatisticsExportVO();
             BeanUtils.copyProperties(v, vo);

fs-company/src/main/java/com/fs/crm/controller/CrmCustomerAssistController.java

@@ -2,7 +2,12 @@ package com.fs.crm.controller;
 
 import java.util.List;
 
+import com.fs.common.core.domain.R;
+import com.fs.common.utils.ServletUtils;
+import com.fs.core.security.LoginUser;
+import com.fs.core.web.service.TokenService;
 import com.fs.crm.param.CrmCustomerAssistDeLParam;
+import com.fs.crm.param.CrmCustomerAssistOperationParam;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -32,6 +37,8 @@ import com.fs.common.core.page.TableDataInfo;
 @RequestMapping("/crm/assist")
 public class CrmCustomerAssistController extends BaseController
 {
+    @Autowired
+    private TokenService tokenService;
     @Autowired
     private ICrmCustomerAssistService crmCustomerAssistService;
 
@@ -71,14 +78,17 @@ public class CrmCustomerAssistController extends BaseController
     }
 
     /**
-     * 新增客户员工协作
+     * 批量新增或修改客户员工协作
      */
     @PreAuthorize("@ss.hasPermi('crm:assist:add')")
-    @Log(title = "客户员工协作", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody CrmCustomerAssist crmCustomerAssist)
+    @Log(title = "客户员工协作", businessType = BusinessType.UPDATE)
+    @PostMapping("/allOperation")
+    public AjaxResult allOperation(@RequestBody List<CrmCustomerAssistOperationParam> params)
     {
-        return toAjax(crmCustomerAssistService.insertCrmCustomerAssist(crmCustomerAssist));
+        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
+        Long companyId = loginUser.getCompany().getCompanyId();
+        Long companyUserId = loginUser.getUser().getUserId();
+        return toAjax(crmCustomerAssistService.allOperation(params,companyId,companyUserId));
     }
 
     /**
@@ -112,4 +122,17 @@ public class CrmCustomerAssistController extends BaseController
     {
         return toAjax(crmCustomerAssistService.deleteCrmCustomerAssistByIds(ids));
     }
+
+    /**
+     * 批量查询
+     */
+    @PostMapping("/selectByCustomerIds")
+    public R selectByCustomerIds(@RequestBody List<Long> customerIds)
+    {
+        if (customerIds!=null && customerIds.size()>10) {
+            return R.error("手动分佣每次仅支持10个客户以内的分配");
+        }
+        return R.ok().put("data",crmCustomerAssistService.selectByCustomerIds(customerIds));
+    }
+
 }

fs-company/src/main/java/com/fs/crm/controller/CrmCustomerController.java

@@ -19,9 +19,11 @@ import com.fs.core.security.LoginUser;
 import com.fs.core.web.service.TokenService;
 import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.param.*;
+import com.fs.crm.service.ICrmCustomerAssistService;
 import com.fs.crm.service.ICrmCustomerContactsService;
 import com.fs.crm.service.ICrmCustomerService;
 import com.fs.crm.service.ICrmCustomerUserService;
+import com.fs.crm.service.impl.CrmCustomerAssistServiceImpl;
 import com.fs.crm.vo.*;
 import com.github.pagehelper.PageHelper;
 import io.swagger.annotations.ApiOperation;
@@ -55,7 +57,8 @@ public class CrmCustomerController extends BaseController
     @Autowired
     ICrmCustomerUserService crmCustomerUserService;
     @Autowired
-    private ICrmCustomerContactsService crmContactsService;
+    private ICrmCustomerAssistService crmCustomerAssistService;
+
     @ApiOperation("获取线索客户")
     @PreAuthorize("@ss.hasPermi('crm:customer:lineList')")
     @GetMapping("/getLineCustomerList")
@@ -248,7 +251,7 @@ public class CrmCustomerController extends BaseController
         }
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setCompanyId(loginUser.getCompany().getCompanyId());
-        return crmCustomerService.assistToUser(loginUser.getUsername(),loginUser.getUser().getUserId(),param);
+        return crmCustomerAssistService.assistToUser(loginUser.getUsername(),loginUser.getUser().getUserId(),param);
     }
 
 
@@ -451,6 +454,14 @@ public class CrmCustomerController extends BaseController
         List<CrmCustomer> list = crmCustomerService.selectCrmCustomerListBySearch(param);
         return R.ok().put("data",list);
     }
+
+    @ApiOperation("置顶切换")
+    @PreAuthorize("@ss.hasPermi('crm:customer:switchToTop')")
+    @PostMapping("/switchToTop/{customerId}")
+    public R switchToTop(@PathVariable Long customerId) {
+        crmCustomerService.switchToTop(customerId);
+        return R.ok();
+    }
     @PreAuthorize("@ss.hasPermi('crm:customer:query2')")
     @GetMapping(value = "/getInfoByMobile/{mobile}")
     public R getInfoByMobile(@PathVariable("mobile") String mobile)

fs-company/src/main/java/com/fs/crm/controller/CrmCustomerLevelController.java

@@ -0,0 +1,40 @@
+package com.fs.crm.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.domain.R;
+import com.fs.crm.domain.CrmCustomerLevel;
+import com.fs.crm.service.ICrmCustomerLevelService;
+import com.fs.his.vo.OptionsVO;
+import lombok.AllArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+@RestController
+@RequestMapping("/crm/customerLevel")
+@AllArgsConstructor
+public class CrmCustomerLevelController extends BaseController {
+
+    private final ICrmCustomerLevelService customerLevelService;
+
+    @GetMapping("/getCustomerLevelOption")
+    public R getCustomerLevelOption(Integer status) {
+        LambdaQueryWrapper<CrmCustomerLevel> wrapper = Wrappers.lambdaQuery();
+        if (Objects.nonNull(status)) {
+            wrapper.eq(CrmCustomerLevel::getStatus, status);
+        }
+        List<OptionsVO> options = customerLevelService.list(wrapper).stream().map(l -> {
+            OptionsVO vo = new OptionsVO();
+            vo.setDictLabel(l.getName());
+            vo.setDictValue(l.getId());
+            return vo;
+        }).collect(Collectors.toList());
+        return R.ok().put("data", options);
+    }
+}

fs-company/src/main/java/com/fs/pay/controller/WxPayController.java

@@ -7,6 +7,8 @@ import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyRecharge;
 import com.fs.company.service.ICompanyRechargeService;
 import com.fs.pay.bean.WxPayBean;
+import com.fs.wx.pay.config.WxPayProperties;
+import com.github.binarywang.wxpay.util.SignUtils;
 import com.ijpay.core.enums.SignType;
 import com.ijpay.core.enums.TradeType;
 import com.ijpay.core.kit.HttpKit;
@@ -45,6 +47,8 @@ public class WxPayController extends WxPayApiController {
     @Autowired
     ICompanyRechargeService rechargeService;
 
+    @Autowired
+    private WxPayProperties wxPayProperties;
 
 
     @Override
@@ -147,44 +151,32 @@ public class WxPayController extends WxPayApiController {
     public String payNotify(HttpServletRequest request) {
         // 支付结果通用通知文档: https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=9_7
         String xmlMsg = HttpKit.readData(request);
-        System.out.println("支付通知="+xmlMsg);
+        log.info("支付通知 {}", xmlMsg);
         Map<String, String> params = WxPayKit.xmlToMap(xmlMsg);
         String returnCode = params.get("return_code");
         // 微信支付订单号
-        String transaction_id      = params.get("transaction_id");
+        String transaction_id = params.get("transaction_id");
         // 商户订单号
-        String out_trade_no      = params.get("out_trade_no");
+        String out_trade_no = params.get("out_trade_no");
         // 注意重复通知的情况，同一订单号可能收到多次通知，请注意一定先判断订单状态
-        // 注意此处签名方式需与统一下单的签名类型一致
-        if (WxPayKit.verifyNotify(params, WxPayApiConfigKit.getWxPayApiConfig().getPartnerKey(), SignType.HMACSHA256)) {
+        // 注意此处签名方式需与统一下单的签名类型一致1
+        if (SignUtils.checkSign(params, String.valueOf(SignType.HMACSHA256), wxPayProperties.getMchKey())) {
             if (WxPayKit.codeIsOk(returnCode)) {
                 // 更新订单信息
                 // 发送通知等
                 String[] order=out_trade_no.split("-");
                 R r;
-                switch (order[0]){
-                    case "recharge":
-                        CompanyRecharge recharge=rechargeService.selectCompanyRechargeByNo(order[1]);
-
-                        if(recharge!=null&&recharge.getStatus()==1){
-                            Map<String, String> xml = new HashMap<String, String>(2);
-                            xml.put("return_code", "SUCCESS");
-                            xml.put("return_msg", "OK");
-                            return WxPayKit.toXml(xml);
-                        }
-                        recharge.setTradeNo(transaction_id);
-                        r= rechargeService.payNotify(recharge);
-                        if(r.get("code").equals(200)){
-                            Map<String, String> xml = new HashMap<String, String>(2);
-                            xml.put("return_code", "SUCCESS");
-                            xml.put("return_msg", "OK");
-                            return WxPayKit.toXml(xml);
-
-                        }
-                        else {
-                            return null;
-                        }
-
+                if (order[0].equals("recharge")) {
+                    r = rechargeService.payNotify(order[1],transaction_id);
+                    if (r.get("code").equals(200)) {
+                        Map<String, String> xml = new HashMap<String, String>(2);
+                        xml.put("return_code", "SUCCESS");
+                        xml.put("return_msg", "OK");
+                        return WxPayKit.toXml(xml);
+
+                    } else {
+                        return null;
+                    }
                 }
             }
         }

fs-company/src/main/java/com/fs/users/controller/FsUserController.java

@@ -133,7 +133,7 @@ public class FsUserController extends BaseController
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         param.setUserId(loginUser.getUser().getUserId());
 //        startPage();
-        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+//        PageHelper.startPage(param.getPageNum(), param.getPageSize());
         PageInfo<FsUserPageListVO> fsUserPageListVOPageInfo = fsUserService.selectFsUserPageList(param);
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("rows", fsUserPageListVOPageInfo.getList());

fs-company/src/main/resources/application.yml

@@ -5,6 +5,6 @@ server:
 spring:
   profiles:
     active: dev
-    include: common,config-dev
+#    include: common,config-dev
 #    active: druid-fby
 #    include: common,config-fby

fs-qw-task/src/main/resources/application.yml

@@ -5,4 +5,4 @@ server:
 spring:
   profiles:
     active: dev
-    include: common,config-dev
+#    include: common,config-dev

fs-service-system/src/main/java/com/fs/company/constant/PaymentStatus.java

@@ -0,0 +1,83 @@
+package com.fs.company.constant;
+
+import lombok.Getter;
+
+/**
+ * 支付状态枚举类
+ *
+ * 描述支付过程中可能的状态
+ */
+@Getter
+public enum PaymentStatus {
+
+    /**
+     * 支付创建，初始状态
+     */
+    CREATED(0, "创建"),
+
+    /**
+     * 支付处理中
+     */
+    PROCESSING(1, "处理中"),
+
+    /**
+     * 支付成功
+     */
+    SUCCESS(2, "支付成功"),
+
+    /**
+     * 支付失败
+     */
+    FAILED(3, "支付失败");
+
+    /**
+     * 状态码
+     * -- GETTER --
+     *  获取状态码
+     *
+     * @return 状态码
+
+     */
+    private final int code;
+
+    /**
+     * 状态描述
+     * -- GETTER --
+     *  获取状态描述
+     *
+     * @return 状态描述
+
+     */
+    private final String description;
+
+    /**
+     * 构造函数
+     *
+     * @param code 状态码
+     * @param description 状态描述
+     */
+    PaymentStatus(int code, String description) {
+        this.code = code;
+        this.description = description;
+    }
+
+    /**
+     * 根据状态码获取对应的枚举值
+     *
+     * @param code 状态码
+     * @return 对应的支付状态枚举，如果没找到则返回null
+     */
+    public static PaymentStatus getByCode(int code) {
+        for (PaymentStatus status : PaymentStatus.values()) {
+            if (status.getCode() == code) {
+                return status;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String toString() {
+        return code + ":" + description;
+    }
+}

fs-service-system/src/main/java/com/fs/company/domain/Company.java

@@ -94,6 +94,9 @@ public class Company extends BaseEntity
     /** 会员是否默认黑名单，1-是；0-否（用于销售分享成为会员的操作） */
     private Integer fsUserIsDefaultBlack;
 
+    /** 后台制单是否需要付款 默认1 0-否 1-是*/
+    private Integer isPay;
+
     public String getOmsCode() {
         return omsCode;
     }
@@ -314,4 +317,12 @@ public class Company extends BaseEntity
     public void setRules(List<String> rules) {
         this.rules = rules;
     }
+
+    public Integer getIsPay() {
+        return isPay;
+    }
+
+    public void setIsPay(Integer isPay) {
+        this.isPay = isPay;
+    }
 }

fs-service-system/src/main/java/com/fs/company/domain/CompanyRechargeOrder.java

@@ -0,0 +1,75 @@
+package com.fs.company.domain;
+
+import lombok.Data;
+import lombok.Builder;
+import lombok.NoArgsConstructor;
+import lombok.AllArgsConstructor;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+ * 公司充值订单表
+ */
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class CompanyRechargeOrder {
+
+    /**
+     * 主键ID
+     */
+    private Long id;
+
+    /**
+     * 订单号
+     */
+    private String orderNo;
+
+    /**
+     * 支付平台交易号
+     */
+    private String transactionId;
+
+    /**
+     * 支付方式：1-微信 2-支付宝 3-银行卡 4-其他
+     */
+    private Integer payType;
+
+    /**
+     * 支付金额
+     */
+    private BigDecimal payAmount;
+
+    private Long companyId;
+
+    private Long userId;
+
+    /**
+     * 支付状态：0-创建 1-处理中 2-支付成功 3-支付失败
+     */
+    private Integer payStatus;
+
+    /**
+     * 支付时间
+     */
+    private LocalDateTime paymentTime;
+
+    /**
+     * 回调内容
+     */
+    private String callbackContent;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createTime;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateTime;
+
+    private String qrLink;
+}

fs-service-system/src/main/java/com/fs/company/dto/RechargeDTO.java

@@ -0,0 +1,15 @@
+package com.fs.company.dto;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+@Data
+public class RechargeDTO {
+    /**
+     * 充值金额
+     */
+    private BigDecimal amount;
+    private Long companyId;
+    private Long userId;
+}

fs-service-system/src/main/java/com/fs/company/mapper/CompanyRechargeOrderMapper.java

@@ -0,0 +1,74 @@
+package com.fs.company.mapper;
+
+import com.fs.company.domain.CompanyRechargeOrder;
+import org.apache.ibatis.annotations.*;
+
+import java.util.List;
+
+/**
+ * 公司充值订单表 Mapper
+ */
+@Mapper
+public interface CompanyRechargeOrderMapper {
+
+    /**
+     * 根据ID查询订单
+     */
+    @Select("SELECT * FROM company_recharge_order WHERE id = #{id}")
+    CompanyRechargeOrder selectById(Long id);
+
+    /**
+     * 根据订单号查询订单
+     */
+    @Select("SELECT * FROM company_recharge_order WHERE order_no = #{orderNo}")
+    CompanyRechargeOrder selectByOrderNo(String orderNo);
+
+    /**
+     * 根据交易号查询订单
+     */
+    @Select("SELECT * FROM company_recharge_order WHERE transaction_id = #{transactionId}")
+    CompanyRechargeOrder selectByTransactionId(String transactionId);
+
+    /**
+     * 查询所有订单
+     */
+    @Select("SELECT * FROM company_recharge_order")
+    List<CompanyRechargeOrder> selectAll();
+
+    /**
+     * 新增订单
+     */
+    @Insert("INSERT INTO company_recharge_order (order_no, transaction_id, pay_type, pay_amount, pay_status, payment_time, callback_content,company_id,user_id) " +
+            "VALUES (#{orderNo}, #{transactionId}, #{payType}, #{payAmount}, #{payStatus}, #{paymentTime}, #{callbackContent},#{companyId},#{userId})")
+    @Options(useGeneratedKeys = true, keyProperty = "id")
+    int insert(CompanyRechargeOrder order);
+
+    /**
+     * 更新订单
+     */
+    @Update("UPDATE company_recharge_order SET " +
+            "transaction_id = #{transactionId}, " +
+            "pay_type = #{payType}, " +
+            "pay_amount = #{payAmount}, " +
+            "pay_status = #{payStatus}, " +
+            "payment_time = #{paymentTime}, " +
+            "callback_content = #{callbackContent} " +
+            "WHERE order_no = #{orderNo}")
+    int updateByOrderNo(CompanyRechargeOrder order);
+
+    /**
+     * 更新订单支付状态
+     */
+    @Update("UPDATE company_recharge_order SET " +
+            "pay_status = #{payStatus}, " +
+            "payment_time = #{paymentTime}, " +
+            "transaction_id = #{transactionId}, " +
+            "callback_content = #{callbackContent} " +
+            "WHERE order_no = #{orderNo}")
+    int updatePayStatus(CompanyRechargeOrder order);
+
+    @Select("SELECT * FROM company_recharge_order " +
+            "WHERE pay_status = 1 " +
+            "AND create_time <= DATE_SUB(NOW(), INTERVAL 2 HOUR)")
+    List<CompanyRechargeOrder> queryOverdueOrder();
+}

fs-service-system/src/main/java/com/fs/company/mapper/CompanyUserMapper.java

@@ -225,7 +225,7 @@ public interface CompanyUserMapper
 
     List<CompanyUser> selectAllCompanyUserByParentId(Long parentId);
 
-    List<CompanyUser> selectAllCompanyUserAndSelf(Long userId);
+    List<CompanyUser> selectAllCompanyUserAndSelf(@Param("userId") Long userId,@Param("companyId") Long companyId);
 
     /**
      * 批量审核用户

fs-service-system/src/main/java/com/fs/company/param/CompanyConfigParam.java

@@ -0,0 +1,10 @@
+package com.fs.company.param;
+
+import com.fs.company.domain.Company;
+import lombok.Data;
+
+@Data
+public class CompanyConfigParam {
+    private Company company;
+    private Integer isPay;
+}

fs-service-system/src/main/java/com/fs/company/service/CompanyRechargeOrderService.java

@@ -0,0 +1,16 @@
+package com.fs.company.service;
+
+import com.fs.company.domain.CompanyRechargeOrder;
+
+import java.util.List;
+
+public interface CompanyRechargeOrderService {
+
+    List<CompanyRechargeOrder> queryOverdueOrder();
+
+    void autoClosedOrder();
+
+    CompanyRechargeOrder createOrder(CompanyRechargeOrder order) throws Exception;
+
+    CompanyRechargeOrder queryOrder(String orderNo);
+}

fs-service-system/src/main/java/com/fs/company/service/ICompanyRechargeService.java

@@ -5,6 +5,8 @@ import java.util.List;
 
 import com.fs.common.core.domain.R;
 import com.fs.company.domain.CompanyRecharge;
+import com.fs.company.domain.CompanyRechargeOrder;
+import com.fs.company.dto.RechargeDTO;
 import com.fs.company.vo.CompanyRechargeExportVO;
 import com.fs.company.vo.CompanyRechargeVO;
 
@@ -70,6 +72,7 @@ public interface ICompanyRechargeService
     CompanyRecharge selectCompanyRechargeByNo(String s);
 
     R payNotify(CompanyRecharge recharge);
+    R payNotify(String orderNo,String transactionId);
 
     BigDecimal selectCompanyRechargeMoney();
 
@@ -80,4 +83,18 @@ public interface ICompanyRechargeService
      * @return 充值集合
      */
     List<CompanyRechargeExportVO> selectCompanyRechargeExportList(CompanyRecharge companyRecharge);
+
+    /**
+     * 充值
+     * @param dto 参数
+     * @return 地址
+     */
+    CompanyRechargeOrder recharge(RechargeDTO dto) throws Exception;
+
+    /**
+     * 查询订单
+     * @param orderNo 订单号
+     * @return CompanyRechargeOrder
+     */
+    CompanyRechargeOrder queryOrder(String orderNo);
 }

fs-service-system/src/main/java/com/fs/company/service/ICompanyService.java

@@ -2,6 +2,7 @@ package com.fs.company.service;
 
 import com.fs.common.core.domain.R;
 import com.fs.company.domain.Company;
+import com.fs.company.param.CompanyConfigParam;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.vo.*;
 import com.fs.his.vo.OptionsVO;
@@ -122,4 +123,8 @@ public interface ICompanyService
      * @return
      */
     List<DeptDataVO> getDeptData(Long companyId);
+
+    int config(CompanyConfigParam param);
+
+    void addRedPacketCompanyMoney(BigDecimal money, Long companyId);
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyRechargeOrderServiceImpl.java

@@ -0,0 +1,101 @@
+package com.fs.company.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fs.common.utils.IpUtil;
+import com.fs.common.utils.OrderUtils;
+import com.fs.company.constant.PaymentStatus;
+import com.fs.company.domain.CompanyRechargeOrder;
+import com.fs.company.mapper.CompanyRechargeOrderMapper;
+import com.fs.company.service.CompanyRechargeOrderService;
+import com.fs.wx.pay.config.WxPayProperties;
+import com.github.binarywang.wxpay.bean.order.WxPayMpOrderResult;
+import com.github.binarywang.wxpay.bean.order.WxPayNativeOrderResult;
+import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
+import com.github.binarywang.wxpay.config.WxPayConfig;
+import com.github.binarywang.wxpay.constant.WxPayConstants;
+import com.github.binarywang.wxpay.service.WxPayService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Service
+public class CompanyRechargeOrderServiceImpl implements CompanyRechargeOrderService {
+    @Autowired
+    private CompanyRechargeOrderMapper companyRechargeOrderMapper;
+
+    @Autowired
+    private WxPayProperties wxPayProperties;
+
+    @Autowired
+    private WxPayService wxPayService;
+    @Override
+    public List<CompanyRechargeOrder> queryOverdueOrder() {
+        return companyRechargeOrderMapper.queryOverdueOrder();
+    }
+
+    /**
+     * 自动关闭超时订单号
+     */
+    @Override
+    public void autoClosedOrder(){
+        List<CompanyRechargeOrder> companyRechargeOrders = companyRechargeOrderMapper.queryOverdueOrder();
+        for (CompanyRechargeOrder order : companyRechargeOrders) {
+            order.setPayStatus(PaymentStatus.FAILED.getCode());
+            companyRechargeOrderMapper.updateByOrderNo(order);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
+    public CompanyRechargeOrder createOrder(CompanyRechargeOrder order) throws Exception{
+
+        WxPayConfig payConfig = new WxPayConfig();
+        payConfig.setAppId(wxPayProperties.getAppId());
+        payConfig.setMchId(wxPayProperties.getMchId());
+        payConfig.setMchKey(wxPayProperties.getMchKey());
+        payConfig.setPrivateKeyPath(wxPayProperties.getPrivateKeyPath());
+        payConfig.setPrivateCertPath(wxPayProperties.getPrivateCertPath());
+        payConfig.setCertSerialNo(wxPayProperties.getCertSerialNo());
+        payConfig.setUseSandboxEnv(false);
+        payConfig.setSignType(WxPayConstants.SignType.HMAC_SHA256);
+
+        wxPayService.setConfig(payConfig);
+
+        WxPayUnifiedOrderRequest orderRequest = new WxPayUnifiedOrderRequest();
+        String orderNo = OrderUtils.getOrderNo();
+        orderRequest.setBody("公司余额充值");
+        orderRequest.setOutTradeNo("recharge-"+orderNo);
+        orderRequest.setTotalFee(order.getPayAmount().multiply(BigDecimal.valueOf(100)).intValue());
+        orderRequest.setSpbillCreateIp(IpUtil.getLocalhostIp());
+        orderRequest.setNotifyUrl(wxPayProperties.getNativeNotifyUrl());
+        orderRequest.setTradeType(WxPayConstants.TradeType.NATIVE);
+        orderRequest.setProductId(String.valueOf(order.getId()));
+
+
+        WxPayNativeOrderResult wxOrder = wxPayService.createOrder(orderRequest);
+
+
+        order.setOrderNo(orderNo);
+        order.setPayType(1);
+        order.setPayStatus(1);
+        order.setCreateTime(LocalDateTime.now());
+        order.setCallbackContent(JSON.toJSONString(wxOrder));
+        order.setQrLink(wxOrder.getCodeUrl());
+
+        companyRechargeOrderMapper.insert(order);
+
+        return order;
+    }
+
+    @Override
+    public CompanyRechargeOrder queryOrder(String orderNo) {
+        return companyRechargeOrderMapper.selectByOrderNo(orderNo);
+    }
+
+
+}

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyRechargeServiceImpl.java

@@ -6,10 +6,15 @@ import java.util.List;
 
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
+import com.fs.company.constant.PaymentStatus;
 import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyMoneyLogs;
+import com.fs.company.domain.CompanyRechargeOrder;
+import com.fs.company.dto.RechargeDTO;
 import com.fs.company.mapper.CompanyMapper;
 import com.fs.company.mapper.CompanyMoneyLogsMapper;
+import com.fs.company.mapper.CompanyRechargeOrderMapper;
+import com.fs.company.service.CompanyRechargeOrderService;
 import com.fs.company.vo.CompanyRechargeExportVO;
 import com.fs.company.vo.CompanyRechargeVO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,6 +22,7 @@ import org.springframework.stereotype.Service;
 import com.fs.company.mapper.CompanyRechargeMapper;
 import com.fs.company.domain.CompanyRecharge;
 import com.fs.company.service.ICompanyRechargeService;
+import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 /**
@@ -34,6 +40,8 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
     private CompanyMoneyLogsMapper moneyLogsMapper;
     @Autowired
     private CompanyMapper companyMapper;
+    @Autowired
+    private CompanyRechargeOrderService companyRechargeOrderService;
     /**
      * 查询充值
      *
@@ -117,13 +125,13 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
     }
 
     @Override
-    @Transactional
+    @Transactional(rollbackFor = Throwable.class,propagation = Propagation.REQUIRED)
     public R payNotify(CompanyRecharge recharge) {
         //修改状态
         recharge.setPayTime(new Date());
         recharge.setStatus(1);
         companyRechargeMapper.updateCompanyRecharge(recharge);
-        Company company=companyMapper.selectCompanyById(recharge.getCompanyId());
+        Company company=companyMapper.selectCompanyByIdForUpdate(recharge.getCompanyId());
         company.setMoney(company.getMoney().add(recharge.getMoney()));
         //写入日志
         CompanyMoneyLogs log=new CompanyMoneyLogs();
@@ -141,6 +149,34 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
         return R.ok();
     }
 
+    @Autowired
+    private CompanyRechargeOrderMapper companyRechargeOrderMapper;
+
+    @Override
+    public R payNotify(String orderNo,String transactionId) {
+        CompanyRechargeOrder order = companyRechargeOrderMapper.selectByOrderNo(orderNo);
+
+        //修改状态
+        order.setPayStatus(PaymentStatus.SUCCESS.getCode());
+        order.setTransactionId(transactionId);
+        companyRechargeOrderMapper.updateByOrderNo(order);
+
+        Company company=companyMapper.selectCompanyByIdForUpdate(order.getCompanyId());
+        //写入日志
+        CompanyMoneyLogs log=new CompanyMoneyLogs();
+        log.setCompanyId(order.getCompanyId());
+        log.setMoney(order.getPayAmount());
+        log.setRemark("充值金额:"+order.getPayAmount()+"元");
+        log.setCreateTime(new Date());
+        log.setLogsType(3);
+        log.setBalance(company.getMoney());
+        moneyLogsMapper.insertCompanyMoneyLogs(log);
+        //修改余额
+        company.setMoney(company.getMoney().add(order.getPayAmount()));
+        companyMapper.updateCompany(company);
+        return R.ok();
+    }
+
     @Override
     public BigDecimal selectCompanyRechargeMoney() {
         return companyRechargeMapper.selectCompanyRechargeMoney();
@@ -150,4 +186,19 @@ public class CompanyRechargeServiceImpl implements ICompanyRechargeService
     public List<CompanyRechargeExportVO> selectCompanyRechargeExportList(CompanyRecharge companyRecharge) {
         return companyRechargeMapper.selectCompanyRechargeExportList(companyRecharge);
     }
+
+    @Override
+    @Transactional(propagation = Propagation.REQUIRED,rollbackFor = Throwable.class)
+    public CompanyRechargeOrder recharge(RechargeDTO dto) throws Exception {
+        CompanyRechargeOrder order = new CompanyRechargeOrder();
+        order.setPayAmount(dto.getAmount());
+        order.setCompanyId(dto.getCompanyId());
+        order.setUserId(dto.getUserId());
+        return companyRechargeOrderService.createOrder(order);
+    }
+
+    @Override
+    public CompanyRechargeOrder queryOrder(String orderNo) {
+        return companyRechargeOrderService.queryOrder(orderNo);
+    }
 }

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyServiceImpl.java

@@ -5,6 +5,7 @@ import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
 import com.fs.company.domain.*;
 import com.fs.company.mapper.*;
+import com.fs.company.param.CompanyConfigParam;
 import com.fs.company.param.CompanyParam;
 import com.fs.company.service.ICompanyService;
 import com.fs.company.vo.CompanyCrmVO;
@@ -21,6 +22,7 @@ import com.fs.system.service.ISysConfigService;
 import org.apache.commons.collections4.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -492,6 +494,28 @@ public class CompanyServiceImpl implements ICompanyService
             }
         }
     }
+    @Override
+    @Transactional
+    public void addRedPacketCompanyMoney(BigDecimal money, Long companyId) {
+        if(companyId!=null&&companyId>0){
+            Company company=companyMapper.selectCompanyByIdForUpdate(companyId);
+            if(company!=null){
+                logger.info("退回红包金额:"+money);
+                company.setMoney(company.getMoney().add(money));
+                companyMapper.updateCompany(company);
+                CompanyMoneyLogs log=new CompanyMoneyLogs();
+                log.setCompanyId(company.getCompanyId());
+                log.setRemark("退回红包金额");
+                log.setMoney(money);
+                log.setLogsType(16);
+                log.setBalance(company.getMoney());
+                log.setCreateTime(new Date());
+                moneyLogsMapper.insertCompanyMoneyLogs(log);
+            }
+        }
+    }
+
+
 
     @Override
     public List<DeptDataVO> getDeptData(Long companyId) {
@@ -516,6 +540,19 @@ public class CompanyServiceImpl implements ICompanyService
 
         return result.stream().filter(e -> CollectionUtils.isNotEmpty(e.getChildren())).collect(Collectors.toList());
     }
+
+    @Override
+    public int config(CompanyConfigParam param) {
+        if (param.getCompany() != null){
+            Company company = new Company();
+            company.setCompanyId(param.getCompany().getCompanyId());
+            company.setIsPay(param.getIsPay());
+            return companyMapper.updateCompany(company);
+        } else {
+            return 0;
+        }
+    }
+
     /**
      * 构建公司节点，包含其下属部门和用户
      * @param company 公司对象

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyTagUserServiceImpl.java

@@ -118,8 +118,14 @@ public class CompanyTagUserServiceImpl implements ICompanyTagUserService
                 keywords = param.getKeyword().split(",");
             }
         }
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param != null ? param.getUserId() : null);
+        if (companyUser != null && companyUser.isAdmin()){
+            companyId = companyUser.getCompanyId();
+        }
         //获取所有销售
-        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUserAndSelf(param != null ? param.getUserId() : null);
+        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUserAndSelf(param != null ? param.getUserId() : null, companyId);
         List<Long> userIds = Collections.emptyList();
         if(companyUsers != null && !companyUsers.isEmpty()){
             userIds = companyUsers.stream().map(CompanyUser::getUserId).collect(Collectors.toList());

fs-service-system/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -452,7 +452,14 @@ public class CompanyUserServiceImpl implements ICompanyUserService
 
     @Override
     public List<CompanyUser> selectAllCompanyUserAndSelf(Long userId) {
-        return companyUserMapper.selectAllCompanyUserAndSelf(userId);
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        List<CompanyUser> list = new ArrayList<>();
+        if (companyUser.isAdmin()){
+            list = companyUserMapper.selectAllCompanyUserAndSelf(userId,companyUser.getCompanyId());
+        }else {
+            list =   companyUserMapper.selectAllCompanyUserAndSelf(userId,null);
+        }
+        return list;
     }
 
     @Override

fs-service-system/src/main/java/com/fs/config/cloud/CloudHostProper.java

@@ -9,4 +9,7 @@ import org.springframework.stereotype.Component;
 public class CloudHostProper {
     @Value("${cloud_host.company_name}")
     private String companyName;
+
+    @Value("${headerImg.imgUrl}")
+    private String headerImg;
 }

fs-service-system/src/main/java/com/fs/course/domain/FsUserWatchStatistics.java

@@ -36,6 +36,14 @@ public class FsUserWatchStatistics extends BaseEntity{
     @Excel(name = "营期开始日期", width = 30, dateFormat = "yyyy-MM-dd")
     private Date periodStartingTime;
 
+    /** 销售公司ids */
+//    @Excel(name = "销售公司ids")
+    private String companyId;
+
+    /** 销售公司名称 */
+    @Excel(name = "销售公司")
+    private String companyName;
+
     /** 新增会员数量 */
     @Excel(name = "新增会员数量")
     private Integer newUserNum;

fs-service-system/src/main/java/com/fs/course/mapper/FsCourseRedPacketLogMapper.java

@@ -125,7 +125,7 @@ public interface FsCourseRedPacketLogMapper
             "</script>"})
     List<FsCourseRedPacketLogListPVO> selectFsCourseRedPacketLogListVO(@Param("maps")FsCourseRedPacketLogParam fsCourseRedPacketLog);
 
-    @Select("SELECT company_id,sum(amount) as money from fs_course_red_packet_log  WHERE status = 1 and  DATE(create_time) = DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY company_id")
+    @Select("SELECT company_id, SUM(amount) as money  FROM fs_course_red_packet_log    WHERE create_time >= DATE_SUB(CURDATE(), INTERVAL 1 DAY)   AND create_time < CURDATE()  GROUP BY company_id ")
     List<RedPacketMoneyVO> selectFsCourseRedPacketLogByCompany();
     @Select("SELECT company_id,sum(amount) as money from fs_course_red_packet_log  WHERE status = 1 GROUP BY company_id")
     List<RedPacketMoneyVO> selectFsCourseRedPacketLogByCompanyFix();
@@ -160,4 +160,11 @@ public interface FsCourseRedPacketLogMapper
 
     @Select("select * from fs_course_red_packet_log where video_id = #{videoId} and user_id = #{userId} and period_id = #{periodId} limit 1")
     FsCourseRedPacketLog selectUserFsCourseRedPacketLog(@Param("videoId") Long videoId, @Param("userId")Long userId, @Param("periodId")Long periodId);
+
+
+
+    @Select("SELECT company_id, SUM(amount) as money FROM fs_course_red_packet_log    WHERE status = 0 and create_time >= DATE_SUB(CURDATE(), INTERVAL 2 DAY)  AND create_time < DATE_SUB(CURDATE(), INTERVAL 1 DAY) GROUP BY company_id  ")
+    List<RedPacketMoneyVO> selectFsCourseAddRedPacketLogByCompany();
+
+
 }

fs-service-system/src/main/java/com/fs/course/mapper/FsUserWatchCourseStatisticsMapper.java

@@ -27,6 +27,14 @@ public interface FsUserWatchCourseStatisticsMapper extends BaseMapper<FsUserWatc
      */
     List<FsUserWatchCourseStatistics> selectFsUserWatchCourseStatisticsList(FsUserWatchCourseStatistics fsUserWatchCourseStatistics);
 
+    /**
+     * 查询会员看课明细汇总
+     *
+     * @param fsUserWatchCourseStatistics 会员看课统计-按课程统计
+     * @return 会员看课统计-按课程统计集合
+     */
+    List<FsUserWatchCourseStatistics> selectFsUserWatchCourseStatisticsListTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics);
+
     /**
      * 新增会员看课统计-按课程统计
      *

fs-service-system/src/main/java/com/fs/course/service/IFsUserWatchCourseStatisticsService.java

@@ -27,6 +27,14 @@ public interface IFsUserWatchCourseStatisticsService extends IService<FsUserWatc
      */
     List<FsUserWatchCourseStatistics> selectFsUserWatchCourseStatisticsList(FsUserWatchCourseStatistics fsUserWatchCourseStatistics);
 
+    /**
+     * 查询会员看课明细汇总
+     *
+     * @param fsUserWatchCourseStatistics 会员看课统计-按课程统计
+     * @return 会员看课统计-按课程统计集合
+     */
+    List<FsUserWatchCourseStatistics> selectFsUserWatchCourseStatisticsListTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics);
+
     /**
      * 新增会员看课统计-按课程统计
      *

fs-service-system/src/main/java/com/fs/course/service/impl/FsCourseLinkServiceImpl.java

@@ -8,6 +8,7 @@ import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyUserMapper;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.FsCourseDomainName;
 import com.fs.course.domain.FsCourseLink;
@@ -64,6 +65,9 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
     @Autowired
     private CompanyUserMapper companyUserMapper;
 
+    @Autowired
+    CloudHostProper cloudHostProper;
+
 
     /**
      * 查询短链
@@ -258,14 +262,14 @@ public class FsCourseLinkServiceImpl implements IFsCourseLinkService
                         return R.error("真实链接不存在").put("realLink", sLink);
                     }
                     log.info("链接仍然有效: {}", sLink);
-                    String json = configService.selectConfigByKey("h5.course.config");
+                    String json = configService.selectConfigByKey("course.config");
                     CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
                     String domainName = companyUserMapper.selectDomainByUserId(courseLink.getCompanyUserId());
                     if (StringUtils.isEmpty(domainName)){
                         domainName = config.getRealLinkDomainName();
                     }
                     String realLink = domainName+courseLink.getRealLink();
-                    String imgUrl = "";
+                    String imgUrl = cloudHostProper.getHeaderImg();
                     return R.ok().put("realLink",realLink ).put("config",config).put("headerImg",imgUrl);
                 }
             } else {

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseServiceImpl.java

@@ -440,7 +440,7 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
 
     @Override
     public R createCourseSortLink(FsCourseLinkCreateParam param) {
-        String json = configService.selectConfigByKey("h5.course.config");
+        String json = configService.selectConfigByKey("course.config");
         CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
 
         //新增链接表信息
@@ -747,16 +747,31 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
     }
 
     private static Calendar getExpireDay(FsCourseLinkCreateParam param, CourseConfig config, Date createTime) {
-        Integer expireDuration;
-        if (param.getEffectiveDuration() == null || param.getEffectiveDuration() == 0){
-            expireDuration = config.getVideoLinkExpireDate();
-        }else {
-            expireDuration = param.getEffectiveDuration();
+        if (param == null || config == null || createTime == null) {
+            throw new IllegalArgumentException("Parameters cannot be null");
         }
-        // 设置过期时间
+
         Calendar calendar = Calendar.getInstance();
-        calendar.setTime(createTime);
-        calendar.add(Calendar.MINUTE, expireDuration);
+
+        if (param.getEffectiveDuration() == null || param.getEffectiveDuration() == 0) {
+            // 未传时间分钟的走配置，当天24:00（次日0:00）过期
+            Integer expireDays = config.getVideoLinkExpireDate() != null ? config.getVideoLinkExpireDate() : 1; // 默认1天
+
+            Date baseDate = param.getSendTime() != null ? param.getSendTime() : createTime;
+            calendar.setTime(baseDate);
+            calendar.add(Calendar.DAY_OF_MONTH, expireDays);
+
+            // 设置为次日0:00（即当天的24:00）
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+        } else {
+            // 传入时间分钟的
+            calendar.setTime(createTime);
+            calendar.add(Calendar.MINUTE, param.getEffectiveDuration());
+        }
+
         return calendar;
     }
 

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java

@@ -1030,6 +1030,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             fsCourseWatchLog.setLogType(1);
             fsCourseWatchLog.setProject(courseProject);
             courseWatchLogMapper.insertFsCourseWatchLog(fsCourseWatchLog);
+
+            String redisKey = "h5wxuser:watch:heartbeat:" + param.getUserId() + ":" + param.getVideoId() + ":" + param.getCompanyUserId();
+            redisCache.setCacheObject(redisKey, LocalDateTime.now().toString());
+            // 设置 Redis 记录的过期时间（例如 5 分钟）
+            redisCache.expire(redisKey, 300, TimeUnit.SECONDS);
         }
 
         // 添加会员销售关系表数据

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserWatchCourseStatisticsServiceImpl.java

@@ -62,6 +62,12 @@ public class FsUserWatchCourseStatisticsServiceImpl extends ServiceImpl<FsUserWa
         return baseMapper.selectFsUserWatchCourseStatisticsList(fsUserWatchCourseStatistics);
     }
 
+    @Override
+    public List<FsUserWatchCourseStatistics> selectFsUserWatchCourseStatisticsListTotal(FsUserWatchCourseStatistics fsUserWatchCourseStatistics)
+    {
+        return baseMapper.selectFsUserWatchCourseStatisticsListTotal(fsUserWatchCourseStatistics);
+    }
+
     /**
      * 新增会员看课统计-按课程统计
      *

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserWatchStatisticsServiceImpl.java

@@ -115,10 +115,6 @@ public class FsUserWatchStatisticsServiceImpl extends ServiceImpl<FsUserWatchSta
     @Transactional
     public void insertStatistics() {
         // 1、获取统计结果
-        // 获取所有营期
-//        FsUserCoursePeriod periodParam = new FsUserCoursePeriod();
-//        List<FsUserCoursePeriod> fsUserCoursePeriods = fsUserCoursePeriodMapper.selectFsUserCoursePeriodList(periodParam);
-
         //获取会员数量和新增会员数量
         List<FsUserWatchStatistics> userTotal = fsUserMapper.selectFsUserTotal();
         FsUserWatchStatistics userTotalStatistics = new FsUserWatchStatistics();
@@ -129,30 +125,17 @@ public class FsUserWatchStatisticsServiceImpl extends ServiceImpl<FsUserWatchSta
         // 获取看课统计
         List<FsUserWatchStatistics> courseWatchStatistics = baseMapper.getCourseWatchStatistics();
 
-        // 转化map
-        Map<Long, FsUserWatchStatistics> watchStatisticsMap = courseWatchStatistics.stream()
-                .collect(Collectors.toMap(
-                        FsUserWatchStatistics::getPeriodId,
-                        Function.identity()
-                ));
+//        // 转化map
+//        Map<Long, FsUserWatchStatistics> watchStatisticsMap = courseWatchStatistics.stream()
+//                .collect(Collectors.toMap(
+//                        FsUserWatchStatistics::getPeriodId,
+//                        Function.identity()
+//                ));
         // 组装数据
-//        List<FsUserWatchStatistics> list = fsUserCoursePeriods.stream().map(v -> {
-//            FsUserWatchStatistics fsUserWatchStatistics = new FsUserWatchStatistics();
-//            BeanUtils.copyProperties(v, fsUserWatchStatistics);
-//            FsUserWatchStatistics count = watchStatisticsMap.getOrDefault(v.getPeriodId(), fsUserWatchStatistics);
-//            fsUserWatchStatistics.setWatchNum(count.getWatchNum());
-//            fsUserWatchStatistics.setCompleteWatchNum(count.getCompleteWatchNum());
-//            fsUserWatchStatistics.setCompleteWatchRate(count.getCompleteWatchRate());
-//            return fsUserWatchStatistics;
-//        }).collect(Collectors.toList());
         for (FsUserWatchStatistics courseWatchStatistic : courseWatchStatistics) {
-            FsUserWatchStatistics count = watchStatisticsMap.getOrDefault(courseWatchStatistic.getPeriodId(), courseWatchStatistic);
             // 单独set，不用copy，避免copy出来的结果被前面的覆盖
             courseWatchStatistic.setUserNum(userTotalStatistics.getUserNum() != null ? userTotalStatistics.getUserNum():0);
             courseWatchStatistic.setNewUserNum(userTotalStatistics.getNewUserNum() != null ? userTotalStatistics.getNewUserNum():0);
-            courseWatchStatistic.setWatchNum(count.getWatchNum() !=null ? count.getWatchNum():0);
-            courseWatchStatistic.setCompleteWatchNum(count.getCompleteWatchNum() != null ? count.getCompleteWatchNum():0);
-            courseWatchStatistic.setCompleteWatchRate(count.getCompleteWatchRate() != null ? count.getCompleteWatchRate(): BigDecimal.ZERO);
             courseWatchStatistic.setCreateTime(new Date());
             courseWatchStatistic.setUpdateTime(new Date());
         }

fs-service-system/src/main/java/com/fs/crm/domain/CrmCustomer.java

@@ -1,16 +1,13 @@
 package com.fs.crm.domain;
 
-import java.math.BigDecimal;
-import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 客户对象 crm_customer
@@ -177,5 +174,12 @@ public class CrmCustomer extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date visitTime;
 
-
+    /**
+     * 客户级别
+     */
+    private Long customerLevel;
+    /**
+     * 是否置顶
+     */
+    private Integer isTop;
 }

fs-service-system/src/main/java/com/fs/crm/domain/CrmCustomerAssist.java

@@ -33,4 +33,6 @@ public class CrmCustomerAssist extends BaseEntity
     /** 销售公司ID */
     @Excel(name = "销售公司ID")
     private Long customerId;
+
+    private Integer Rate;
 }

fs-service-system/src/main/java/com/fs/crm/domain/CrmCustomerLevel.java

@@ -0,0 +1,28 @@
+package com.fs.crm.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+@TableName("crm_customer_level")
+@Data
+public class CrmCustomerLevel {
+    /**
+     * 主键ID
+     */
+    @TableId(type = IdType.AUTO)
+    private Long id;
+    /**
+     * 级别名称
+     */
+    private String name;
+    /**
+     * 状态 0显示 1停用
+     */
+    private Integer status;
+    /**
+     * 序号
+     */
+    private Integer sort;
+}

fs-service-system/src/main/java/com/fs/crm/mapper/CrmCustomerAssistMapper.java

@@ -81,4 +81,6 @@ public interface CrmCustomerAssistMapper
      * @return
      */
     List<Long> selectCompanyUserIdByCustomerId(@Param("customerId") Long customerId,@Param("createTime") Date createTime);
+
+    List<CrmCustomerAssist> selectByCustomerId(Long customerId);
 }

fs-service-system/src/main/java/com/fs/crm/mapper/CrmCustomerLevelMapper.java

@@ -0,0 +1,18 @@
+package com.fs.crm.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fs.crm.domain.CrmCustomerLevel;
+import com.fs.crm.param.CrmCustomerLevelQueryParam;
+import com.fs.crm.vo.CrmCustomerLevelVO;
+
+import java.util.List;
+
+public interface CrmCustomerLevelMapper extends BaseMapper<CrmCustomerLevel> {
+
+    /**
+     * 查询客户级别列表
+     * @param param 参数
+     * @return  list
+     */
+    List<CrmCustomerLevelVO> selectCrmCustomerLevelVOList(CrmCustomerLevelQueryParam param);
+}

fs-service-system/src/main/java/com/fs/crm/mapper/CrmCustomerMapper.java

@@ -1,8 +1,5 @@
 package com.fs.crm.mapper;
 
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fs.crm.domain.CrmCustomer;
@@ -13,6 +10,9 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 客户Mapper接口
 
@@ -143,6 +143,9 @@ public interface CrmCustomerMapper extends BaseMapper<CrmCustomer>
             "<if test = 'maps.deptId != null  and maps.deptId != 0 '> " +
             "AND (c.dept_id = #{maps.deptId} OR c.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) )) " +
             "</if>" +
+            "<if test = 'maps.customerLevel != null'> " +
+            "and c.customer_level =#{maps.customerLevel} " +
+            "</if>" +
             "${maps.params.dataScope}"+
             " order by c.customer_id desc "+
             "</script>"})
@@ -266,8 +269,11 @@ public interface CrmCustomerMapper extends BaseMapper<CrmCustomer>
             "<if test = 'maps.deptId != null  and maps.deptId != 0 '> " +
             "AND (c.dept_id = #{maps.deptId} OR c.dept_id IN ( SELECT t.dept_id FROM company_dept t WHERE find_in_set(#{maps.deptId}, ancestors) )) " +
             "</if>" +
+            "<if test = 'maps.customerLevel != null'> " +
+            "and c.customer_level = #{maps.customerLevel} " +
+            "</if>" +
             "${maps.params.dataScope}"+
-            " order by c.customer_id desc "+
+            " order by c.is_top desc, c.customer_id desc "+
             "</script>"})
     List<CrmCustomerListVO> selectCrmCustomerListQueryParam(@Param("maps")CrmCustomerListQueryParam crmCustomer);
 
@@ -412,7 +418,10 @@ public interface CrmCustomerMapper extends BaseMapper<CrmCustomer>
             "<if test = 'maps.endTime != null and maps.endTime != \"\" '> " +
             "and date_format(c.create_time,'%y%m%d') &lt;= date_format(#{maps.endTime},'%y%m%d') " +
             "</if>" +
-            " order by c.customer_id desc "+
+            "<if test = 'maps.customerLevel != null'> " +
+            "and c.customer_level =#{maps.customerLevel} " +
+            "</if>" +
+            " order by c.is_top desc,c.customer_id desc "+
             "</script>"})
     List<CrmLineCustomerListQueryVO> selectCrmLineCustomerListQuery(@Param("maps")CrmLineCustomerListQueryParam param);
 

fs-service-system/src/main/java/com/fs/crm/param/CrmCustomerAssistOperationParam.java

@@ -0,0 +1,10 @@
+package com.fs.crm.param;
+
+import com.fs.crm.domain.CrmCustomerAssist;
+import lombok.Data;
+
+
+@Data
+public class CrmCustomerAssistOperationParam extends CrmCustomerAssist {
+    private String operation;
+}

fs-service-system/src/main/java/com/fs/crm/param/CrmCustomerLevelParm.java

@@ -0,0 +1,26 @@
+package com.fs.crm.param;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class CrmCustomerLevelParm {
+    /**
+     * 主键ID
+     */
+    private Long id;
+    /**
+     * 级别名称
+     */
+    @NotBlank(message = "级别名称不能为空")
+    private String name;
+    /**
+     * 状态 0显示 1停用
+     */
+    private Integer status;
+    /**
+     * 序号
+     */
+    private Integer sort;
+}

fs-service-system/src/main/java/com/fs/crm/param/CrmCustomerLevelQueryParam.java

@@ -0,0 +1,11 @@
+package com.fs.crm.param;
+
+import lombok.Data;
+
+@Data
+public class CrmCustomerLevelQueryParam {
+    /**
+     * 级别名称
+     */
+    private String name;
+}

fs-service-system/src/main/java/com/fs/crm/param/CrmCustomerListQueryParam.java

@@ -2,7 +2,6 @@ package com.fs.crm.param;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fs.common.annotation.Excel;
-import com.fs.common.core.domain.BaseEntity;
 import com.fs.common.param.BaseQueryParam;
 import lombok.Data;
 
@@ -98,5 +97,9 @@ public class CrmCustomerListQueryParam extends BaseQueryParam
 
     private String[] receiveTimeList;
 
+    /**
+     * 客户级别
+     */
+    private Long customerLevel;
 
 }

fs-service-system/src/main/java/com/fs/crm/param/CrmFullCustomerListQueryParam.java

@@ -87,4 +87,7 @@ public class CrmFullCustomerListQueryParam extends BaseQueryParam
 
     private Integer isPool;
 
+    /** 客户级别 */
+    private Long customerLevel;
+
 }

fs-service-system/src/main/java/com/fs/crm/param/CrmLineCustomerListQueryParam.java

@@ -86,4 +86,6 @@ public class CrmLineCustomerListQueryParam extends BaseQueryParam
     @Excel(name = "标签" )
     private String tags;
 
+    /** 客户级别 */
+    private Long customerLevel;
 }

fs-service-system/src/main/java/com/fs/crm/param/CrmMyCustomerListQueryParam.java

@@ -94,4 +94,7 @@ public class CrmMyCustomerListQueryParam extends BaseQueryParam
     private Integer isHisOrder;
     private String corpId;
 
+    /** 客户级别 */
+    private Long customerLevel;
+
 }

fs-service-system/src/main/java/com/fs/crm/service/ICrmCustomerAssistService.java

@@ -1,8 +1,13 @@
 package com.fs.crm.service;
 
 import java.util.List;
+
+import com.fs.common.core.domain.R;
 import com.fs.crm.domain.CrmCustomerAssist;
+import com.fs.crm.param.CrmCustomeAssignParam;
 import com.fs.crm.param.CrmCustomerAssistDeLParam;
+import com.fs.crm.param.CrmCustomerAssistOperationParam;
+import com.fs.crm.vo.CrmCustomerAssistVo;
 
 /**
  * 客户员工协作Service接口
@@ -61,4 +66,10 @@ public interface ICrmCustomerAssistService
     public int deleteCrmCustomerAssistById(Long id);
 
     int removeByCustomer(CrmCustomerAssistDeLParam param);
+
+    R assistToUser(String opeUserName, Long opeUserId, CrmCustomeAssignParam param);
+
+    List<CrmCustomerAssistVo> selectByCustomerIds(List<Long> customerIds);
+
+    int allOperation(List<CrmCustomerAssistOperationParam> params,Long companyId,Long companyUserId);
 }

fs-service-system/src/main/java/com/fs/crm/service/ICrmCustomerLevelService.java

@@ -0,0 +1,40 @@
+package com.fs.crm.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.fs.crm.domain.CrmCustomerLevel;
+import com.fs.crm.param.CrmCustomerLevelParm;
+import com.fs.crm.param.CrmCustomerLevelQueryParam;
+import com.fs.crm.vo.CrmCustomerLevelVO;
+
+import java.util.List;
+
+public interface ICrmCustomerLevelService extends IService<CrmCustomerLevel> {
+
+    /**
+     * 查询客户级别列表
+     * @param param 参数
+     * @return  list
+     */
+    List<CrmCustomerLevelVO> selectCrmCustomerLevelVOList(CrmCustomerLevelQueryParam param);
+
+    /**
+     * 新增客户级别
+     * @param param 参数
+     * @return 受影响行数
+     */
+    int saveCustomerLevel(CrmCustomerLevelParm param);
+
+    /**
+     * 修改客户级别
+     * @param param 参数
+     * @return 受影响行数
+     */
+    int editCustomerLevel(CrmCustomerLevelParm param);
+
+    /**
+     * 根据ID查询
+     * @param id id
+     * @return CrmCustomerLevelVO
+     */
+    CrmCustomerLevelVO selectCrmCustomerLevelVOById(Long id);
+}

fs-service-system/src/main/java/com/fs/crm/service/ICrmCustomerService.java

@@ -1,16 +1,14 @@
 package com.fs.crm.service;
 
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.fastjson.JSONObject;
 import com.fs.common.core.domain.R;
 import com.fs.crm.domain.CrmCustomer;
 import com.fs.crm.param.*;
 import com.fs.crm.vo.*;
 import com.fs.qwApi.param.QwCustomerDetailParam;
-import com.fs.store.dto.StoreOrderExpressExportDTO;
-import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 客户Service接口
@@ -117,9 +115,6 @@ public interface ICrmCustomerService
 
     R assignCompanys(CrmCompanyAssignParam param, String operUserName,Long operUserId);
 
-    R assistToUser(String opeUserName, Long opeUserId, CrmCustomeAssignParam param);
-
-
     int updateCrmCustomerSource(CrmCustomerEditSourceParam param);
 
     List<CrmCustomer> selectCrmCustomerListByIds(String customerIds);
@@ -142,5 +137,11 @@ public interface ICrmCustomerService
 
     List<CrmMyCustomerListQueryVO> selectCrmMyAssistListQuery(CrmMyCustomerListQueryParam param);
 
+    /**
+     * 置顶切换
+     * @param customerId 客户ID
+     */
+    void switchToTop(Long customerId);
+
     CrmCustomer selectFscrmByMobile(String mobile);
 }

fs-service-system/src/main/java/com/fs/crm/service/impl/CrmCustomerAssistServiceImpl.java

@@ -1,13 +1,36 @@
 package com.fs.crm.service.impl;
 
-import java.util.List;
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
+
+import cn.jiguang.common.resp.APIConnectionException;
+import cn.jiguang.common.resp.APIRequestException;
+import com.fs.common.core.domain.R;
 import com.fs.common.utils.DateUtils;
+import com.fs.common.utils.StringUtils;
+import com.fs.company.domain.CompanyUser;
+import com.fs.company.mapper.CompanyUserMapper;
+import com.fs.crm.domain.CrmCustomer;
+import com.fs.crm.domain.CrmCustomerLogs;
+import com.fs.crm.domain.CrmCustomerUser;
+import com.fs.crm.dto.CrmCustomerAssignUserDTO;
+import com.fs.crm.enums.CustomerLogEnum;
+import com.fs.crm.mapper.CrmCustomerLogsMapper;
+import com.fs.crm.mapper.CrmCustomerMapper;
+import com.fs.crm.mapper.CrmCustomerUserMapper;
+import com.fs.crm.param.CrmCustomeAssignParam;
 import com.fs.crm.param.CrmCustomerAssistDeLParam;
+import com.fs.crm.param.CrmCustomerAssistOperationParam;
+import com.fs.crm.vo.CrmCustomerAssistVo;
+import com.fs.jpush.service.JpushService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.fs.crm.mapper.CrmCustomerAssistMapper;
 import com.fs.crm.domain.CrmCustomerAssist;
 import com.fs.crm.service.ICrmCustomerAssistService;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 客户员工协作Service业务层处理
@@ -20,6 +43,16 @@ public class CrmCustomerAssistServiceImpl implements ICrmCustomerAssistService
 {
     @Autowired
     private CrmCustomerAssistMapper crmCustomerAssistMapper;
+    @Autowired
+    private CompanyUserMapper companyUserMapper;
+    @Autowired
+    private CrmCustomerMapper crmCustomerMapper;
+    @Autowired
+    private CrmCustomerUserMapper crmCustomerUserMapper;
+    @Autowired
+    private CrmCustomerLogsMapper logsMapper;
+    @Autowired
+    private JpushService jpushService;
 
     /**
      * 查询客户员工协作
@@ -95,10 +128,188 @@ public class CrmCustomerAssistServiceImpl implements ICrmCustomerAssistService
     }
 
     @Override
+    @Transactional
     public int removeByCustomer(CrmCustomerAssistDeLParam param) {
         if (param.getCustomerIds() == null || param.getCustomerIds().isEmpty()) {
             return 0;
         }
+        //计算分佣
+        delComputeRate(param);
         return crmCustomerAssistMapper.removeByCustomer(param);
     }
+
+    /**
+     *  删除协作人分配佣金
+     * @param param
+     */
+    private void delComputeRate(CrmCustomerAssistDeLParam param) {
+        List<Long> customerIds = param.getCustomerIds();
+        Long companyUserId = param.getCompanyUserId();
+        customerIds.forEach(customerId -> {
+            List<CrmCustomerAssist> assistList = crmCustomerAssistMapper.selectByCustomerId(customerId);
+            if (assistList != null && !assistList.isEmpty()) {
+                int i = assistList.size() - 1; //-1因为需要删除一个协作者
+                if (i>0){
+                    //+1因为还有原所属人
+                    int rate = BigDecimal.valueOf(100).divide(BigDecimal.valueOf(i+1), 2, BigDecimal.ROUND_HALF_UP).intValue();
+                    int num = 0;
+                    for (int t = 0; t < i + 1; t++) {
+                        num += rate;
+                    }
+                    int specialRate;
+                    if (num > 100) {
+                        //如果小于100 那就是原所属人分配多的佣金
+                        specialRate = rate-(num - 100);
+                    } else {
+                        specialRate = 0;
+                    }
+                    int index = 0;
+                    List<CrmCustomerAssist> newAssistList = assistList.stream().filter(temp -> !Objects.equals(temp.getCompanyUserId(), companyUserId)).collect(Collectors.toList());
+                    for (CrmCustomerAssist crmCustomerAssist : newAssistList) {
+                        //更新
+                        if (specialRate > 0 && index == newAssistList.size()-1){
+                            crmCustomerAssist.setRate(specialRate);
+                        }else {
+                            crmCustomerAssist.setRate(rate);
+                        }
+                        crmCustomerAssistMapper.updateCrmCustomerAssist(crmCustomerAssist);
+                        index++;
+                    }
+                }
+            }
+        });
+    }
+
+    /**
+     *  添加协作人分配佣金
+     * @param param
+     */
+    private Integer addComputeRate(CrmCustomerAssist param) {
+        Long customerId = param.getCustomerId();
+        List<CrmCustomerAssist> assistList = crmCustomerAssistMapper.selectByCustomerId(customerId);
+        if (assistList != null) {
+            int i = assistList.size() + 2; //+2因为还有原所属人和添加协作者
+            int rate = BigDecimal.valueOf(100).divide(BigDecimal.valueOf(i), 2, BigDecimal.ROUND_HALF_UP).intValue();
+            int num = 0;
+            for (int t = 0; t < i ; t++) {
+                num += rate;
+            }
+            int specialRate;
+            if (num > 100) {
+                specialRate = rate-(num - 100);
+            } else {
+                //如果小于100 那就是原所属人分配多的佣金
+                specialRate = 0;
+            }
+            for (CrmCustomerAssist crmCustomerAssist : assistList) {
+                //更新
+                crmCustomerAssist.setRate(rate);
+                crmCustomerAssistMapper.updateCrmCustomerAssist(crmCustomerAssist);
+            }
+            if (specialRate > 0){
+                return specialRate;
+            } else {
+                return rate;
+            }
+        }
+        return 50;
+    }
+
+    @Override
+    @Transactional
+    public R assistToUser(String opeUserName, Long opeUserId, CrmCustomeAssignParam param) {
+        Integer index = 0;
+        for (CrmCustomerAssignUserDTO userDTO : param.getUsers()) {
+            CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userDTO.getCompanyUserId());
+            for (int i = 0; i < userDTO.getCount(); i++) {
+                CrmCustomer customer = crmCustomerMapper.selectCrmCustomerById(param.getCustomerIds().get(index));
+                //不能选择客户拥有者本人
+                CrmCustomerUser crmCustomerUser = crmCustomerUserMapper.selectCrmCustomerUserById(customer.getCustomerUserId());
+                if (Objects.equals(crmCustomerUser.getCompanyUserId(), userDTO.getCompanyUserId())) {
+                    return R.error("不能选择自己来协作!");
+                }
+                //查询协作客户
+                CrmCustomerAssist customerAssist = new CrmCustomerAssist();
+                customerAssist.setCustomerId(customer.getCustomerId());
+                customerAssist.setCompanyUserId(userDTO.getCompanyUserId());
+                List<CrmCustomerAssist> tempList = crmCustomerAssistMapper.selectCrmCustomerAssistList(customerAssist);
+                if (tempList != null && !tempList.isEmpty()) {
+                    return R.error("销售:" + companyUser.getNickName() + "(" + userDTO.getCompanyUserId() + ")已拥有改该协作客户:" + customer.getCustomerName());
+                }
+                customerAssist.setCompanyId(param.getCompanyId());
+                customerAssist.setCompanyUserName(companyUser.getNickName());
+                customerAssist.setCreateTime(new Date());
+                //分配佣金
+                Integer rate = addComputeRate(customerAssist);
+                customerAssist.setRate(rate);
+                crmCustomerAssistMapper.insertCrmCustomerAssist(customerAssist);
+                //写日志
+                CrmCustomerLogs logs = new CrmCustomerLogs();
+                logs.setCustomerId(customer.getCustomerId());
+                logs.setCreateTime(new Date());
+                logs.setLogsType(CustomerLogEnum.ASSIST_USER.getValue());
+                logs.setTitle(CustomerLogEnum.ASSIST_USER.getDesc());
+                logs.setRemark(opeUserName + "为客户" + customer.getCustomerName() + "添加协作人:" + companyUser.getNickName());
+                logs.setCompanyUserId(userDTO.getCompanyUserId());
+                logsMapper.insertCrmCustomerLogs(logs);
+
+                if (StringUtils.isNotEmpty(companyUser.getJpushId())) {
+                    Map<String, String> extrasMap = new HashMap<>();
+                    extrasMap.put("customerId", customer.getCustomerId().toString());
+                    extrasMap.put("type", "1");
+                    try {
+                        jpushService.sendRegisterIdPush("客户消息", "您收到 一个客户协作邀请", extrasMap, companyUser.getJpushId());
+                    } catch (APIConnectionException e) {
+                    } catch (APIRequestException e) {
+                    }
+                }
+                index++;
+            }
+        }
+        return R.ok();
+    }
+
+    @Override
+    public List<CrmCustomerAssistVo> selectByCustomerIds(List<Long> customerIds) {
+        if (customerIds != null && !customerIds.isEmpty()) {
+            //如果超过10个建议用多线程
+            ArrayList<CrmCustomerAssistVo> vos = new ArrayList<>(customerIds.size());
+            customerIds.forEach(customerId->{
+                CrmCustomerAssistVo vo = new CrmCustomerAssistVo();
+                List<CrmCustomerAssist> assists = crmCustomerAssistMapper.selectByCustomerId(customerId);
+                vo.setCustomerId(customerId);
+                vo.setAssistList(assists);
+                vos.add(vo);
+            });
+            return vos;
+        }
+        return null;
+    }
+
+    @Override
+    public int allOperation(List<CrmCustomerAssistOperationParam> params,Long companyId,Long companyUserId) {
+        AtomicInteger count = new AtomicInteger();
+        params.forEach(param->{
+            String operation = param.getOperation();
+            switch (operation){
+                case "ADD":
+                    if (!Objects.equals(companyUserId, param.getCompanyUserId())){
+                        param.setCompanyId(companyId);
+                        crmCustomerAssistMapper.insertCrmCustomerAssist(param);
+                    }
+                    break;
+                case "DELETE":
+                    crmCustomerAssistMapper.deleteCrmCustomerAssistById(param.getId());
+                    break;
+                case "UPDATE":
+                    param.setCompanyId(companyId);
+                    crmCustomerAssistMapper.updateCrmCustomerAssist(param);
+                    break;
+                default:
+                    break;
+            }
+            count.getAndIncrement();
+        });
+        return count.get();
+    }
 }

fs-service-system/src/main/java/com/fs/crm/service/impl/CrmCustomerLevelServiceImpl.java

@@ -0,0 +1,102 @@
+package com.fs.crm.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fs.common.exception.CustomException;
+import com.fs.common.utils.bean.BeanUtils;
+import com.fs.crm.domain.CrmCustomerLevel;
+import com.fs.crm.mapper.CrmCustomerLevelMapper;
+import com.fs.crm.param.CrmCustomerLevelParm;
+import com.fs.crm.param.CrmCustomerLevelQueryParam;
+import com.fs.crm.service.ICrmCustomerLevelService;
+import com.fs.crm.vo.CrmCustomerLevelVO;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Objects;
+
+@Service
+public class CrmCustomerLevelServiceImpl extends ServiceImpl<CrmCustomerLevelMapper, CrmCustomerLevel> implements ICrmCustomerLevelService {
+
+    /**
+     * 查询客户级别列表
+     * @param param 参数
+     * @return  list
+     */
+    @Override
+    public List<CrmCustomerLevelVO> selectCrmCustomerLevelVOList(CrmCustomerLevelQueryParam param) {
+        return baseMapper.selectCrmCustomerLevelVOList(param);
+    }
+
+    /**
+     * 新增客户级别
+     * @param param 参数
+     * @return 受影响行数
+     */
+    @Override
+    public int saveCustomerLevel(CrmCustomerLevelParm param) {
+        CrmCustomerLevel crmCustomerLevel = getCustomerLevelByName(param.getName());
+        if (Objects.nonNull(crmCustomerLevel)) {
+            throw new CustomException("级别名称已存在");
+        }
+
+        crmCustomerLevel = new CrmCustomerLevel();
+        BeanUtils.copyProperties(param, crmCustomerLevel, "id");
+        return baseMapper.insert(crmCustomerLevel);
+    }
+
+    /**
+     * 根据名称查询客户级别
+     * @param name 名称
+     * @return CrmCustomerLevel
+     */
+    private CrmCustomerLevel getCustomerLevelByName(String name) {
+        Wrapper<CrmCustomerLevel> queryWrapper = Wrappers.<CrmCustomerLevel>lambdaQuery()
+                .eq(CrmCustomerLevel::getName, name)
+                .last("limit 1");
+        return getOne(queryWrapper);
+    }
+
+    /**
+     * 修改客户级别
+     * @param param 参数
+     * @return 受影响行数
+     */
+    @Override
+    public int editCustomerLevel(CrmCustomerLevelParm param) {
+        if (Objects.isNull(param.getId())) {
+            throw new CustomException("ID不能为空");
+        }
+
+        CrmCustomerLevel customerLevel = getById(param.getId());
+        if (Objects.isNull(customerLevel)) {
+            throw new CustomException("记录不存在");
+        }
+
+        CrmCustomerLevel levelByName = getCustomerLevelByName(param.getName());
+        if (Objects.nonNull(levelByName) && !levelByName.getId().equals(customerLevel.getId())) {
+            throw new CustomException("级别名称已存在");
+        }
+
+        BeanUtils.copyProperties(param, customerLevel, "id");
+        return baseMapper.updateById(customerLevel);
+    }
+
+    /**
+     * 根据ID查询
+     * @param id id
+     * @return CrmCustomerLevelVO
+     */
+    @Override
+    public CrmCustomerLevelVO selectCrmCustomerLevelVOById(Long id) {
+        CrmCustomerLevel customerLevel = getById(id);
+        if (Objects.isNull(customerLevel)) {
+            throw new CustomException("记录不存在");
+        }
+
+        CrmCustomerLevelVO crmCustomerLevelVO = new CrmCustomerLevelVO();
+        BeanUtils.copyProperties(customerLevel, crmCustomerLevelVO);
+        return crmCustomerLevelVO;
+    }
+}

fs-service-system/src/main/java/com/fs/crm/service/impl/CrmCustomerServiceImpl.java

@@ -796,57 +796,6 @@ public class CrmCustomerServiceImpl extends ServiceImpl<CrmCustomerMapper, CrmCu
         return R.ok("分配成功");
     }
 
-    @Override
-    @Transactional
-    public R assistToUser(String opeUserName, Long opeUserId, CrmCustomeAssignParam param) {
-        Integer index=0;
-        for(CrmCustomerAssignUserDTO userDTO:param.getUsers()){
-            CompanyUser companyUser=companyUserMapper.selectCompanyUserById(userDTO.getCompanyUserId());
-            for(int i=0;i<userDTO.getCount();i++){
-                CrmCustomer customer=crmCustomerMapper.selectCrmCustomerById(param.getCustomerIds().get(index));
-                //不能选择客户拥有者本人
-                CrmCustomerUser crmCustomerUser = crmCustomerUserMapper.selectCrmCustomerUserById(customer.getCustomerUserId());
-                if (Objects.equals(crmCustomerUser.getCompanyUserId(), userDTO.getCompanyUserId())){
-                    return R.error("不能选择自己来协作!");
-                }
-                //查询协作客户
-                CrmCustomerAssist customerAssist=new CrmCustomerAssist();
-                customerAssist.setCustomerId(customer.getCustomerId());
-                customerAssist.setCompanyUserId(userDTO.getCompanyUserId());
-                List<CrmCustomerAssist> tempList = assistMapper.selectCrmCustomerAssistList(customerAssist);
-                if(tempList!=null && !tempList.isEmpty()){
-                    return R.error("销售:" + companyUser.getNickName() +"(" + userDTO.getCompanyUserId() + ")已拥有改该协作客户:" + customer.getCustomerName());
-                }
-                customerAssist.setCompanyId(param.getCompanyId());
-                customerAssist.setCompanyUserName(companyUser.getNickName());
-                customerAssist.setCreateTime(new Date());
-                assistMapper.insertCrmCustomerAssist(customerAssist);
-                //写日志
-                CrmCustomerLogs logs=new CrmCustomerLogs();
-                logs.setCustomerId(customer.getCustomerId());
-                logs.setCreateTime(new Date());
-                logs.setLogsType(CustomerLogEnum.ASSIST_USER.getValue());
-                logs.setTitle(CustomerLogEnum.ASSIST_USER.getDesc());
-                logs.setRemark(opeUserName+"为客户"+customer.getCustomerName()+"添加协作人:" + companyUser.getNickName());
-                logs.setCompanyUserId(userDTO.getCompanyUserId());
-                logsMapper.insertCrmCustomerLogs(logs);
-
-                if(StringUtils.isNotEmpty(companyUser.getJpushId())){
-                    Map<String, String> extrasMap=new HashMap<>();
-                    extrasMap.put("customerId",customer.getCustomerId().toString());
-                    extrasMap.put("type","1");
-                    try {
-                        jpushService.sendRegisterIdPush("客户消息","您收到 一个客户协作邀请",extrasMap,companyUser.getJpushId());
-                    } catch (APIConnectionException e) {
-                    } catch (APIRequestException e) {
-                    }
-                }
-                index++;
-            }
-        }
-        return R.ok();
-    }
-
     @Override
     public int updateCrmCustomerSource(CrmCustomerEditSourceParam param) {
         return crmCustomerMapper.updateCrmCustomerSource(param);
@@ -963,6 +912,21 @@ public class CrmCustomerServiceImpl extends ServiceImpl<CrmCustomerMapper, CrmCu
         return vos;
     }
 
+    /**
+     * 置顶切换
+     * @param customerId 客户ID
+     */
+    @Override
+    public void switchToTop(Long customerId) {
+        CrmCustomer crmCustomer = crmCustomerMapper.selectCrmCustomerById(customerId);
+        if (Objects.isNull(crmCustomer)){
+            throw new CustomException("客户不存在");
+        }
+
+        crmCustomer.setIsTop(crmCustomer.getIsTop() == 0 ? 1 : 0);
+        crmCustomerMapper.updateCrmCustomer(crmCustomer);
+    }
+
     @Override
     public CrmCustomer selectFscrmByMobile(String mobile){
         return crmCustomerMapper.selectFscrmByMobile(mobile);

fs-service-system/src/main/java/com/fs/crm/vo/CrmCustomerAssistVo.java

@@ -0,0 +1,12 @@
+package com.fs.crm.vo;
+
+import com.fs.crm.domain.CrmCustomerAssist;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class CrmCustomerAssistVo {
+    private Long customerId;
+    private List<CrmCustomerAssist> assistList;
+}

fs-service-system/src/main/java/com/fs/crm/vo/CrmCustomerLevelVO.java

@@ -0,0 +1,23 @@
+package com.fs.crm.vo;
+
+import lombok.Data;
+
+@Data
+public class CrmCustomerLevelVO {
+    /**
+     * 主键ID
+     */
+    private Long id;
+    /**
+     * 级别名称
+     */
+    private String name;
+    /**
+     * 状态 0显示 1停用
+     */
+    private Integer status;
+    /**
+     * 序号
+     */
+    private Integer sort;
+}

fs-service-system/src/main/java/com/fs/crm/vo/CrmCustomerListVO.java

@@ -127,4 +127,9 @@ public class CrmCustomerListVO implements Serializable
     @Excel(name = "进线客户提交日期" )
     private String registerSubmitTime;
 
+    /** 客户级别 */
+    private Long customerLevel;
+    /** 置顶状态 0未置顶 1置顶 */
+    private Integer isTop;
+
 }

fs-service-system/src/main/java/com/fs/crm/vo/CrmFullCustomerListQueryVO.java

@@ -101,4 +101,7 @@ public class CrmFullCustomerListQueryVO implements Serializable
     private String sourceCode;
     private String pushTime;
     private String pushCode;
+
+    /** 客户级别 */
+    private Long customerLevel;
 }

fs-service-system/src/main/java/com/fs/crm/vo/CrmLineCustomerListQueryVO.java

@@ -106,5 +106,9 @@ public class CrmLineCustomerListQueryVO implements Serializable
     /** 非重客户Id(重客户最早录入手机号码的客户id) */
     private Long dCustomerId;
 
+    /** 客户级别 */
+    private Long customerLevel;
+    /** 是否置顶 0未置顶 1置顶 */
+    private Integer isTop;
 
 }

fs-service-system/src/main/java/com/fs/crm/vo/CrmMyCustomerListQueryVO.java

@@ -123,4 +123,7 @@ public class CrmMyCustomerListQueryVO implements Serializable
     private List<String> assistUser;
     private Long companyUserId;
 
+    /** 客户级别 */
+    private Long customerLevel;
+
 }

fs-service-system/src/main/java/com/fs/erp/service/impl/WdtErpOrderServiceImpl.java

@@ -17,6 +17,8 @@ import com.fs.erp.dto.sdk.wangdian.api.WdtClient;
 import com.fs.erp.dto.sdk.wangdian.enums.*;
 import com.fs.erp.dto.wdt.*;
 import com.fs.erp.service.IErpOrderService;
+import com.fs.his.config.FsErpConfig;
+import com.fs.his.utils.ConfigUtil;
 import com.fs.store.domain.FsStoreOrder;
 import com.fs.store.domain.FsStoreProduct;
 import com.fs.store.service.IFsStoreOrderItemService;
@@ -54,12 +56,19 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
     @Autowired
     private IFsStoreProductService fsStoreProductService;
 
-    @Value("${fsConfig.erpWdShopCode}")
-    private String shopCode;
+//    @Value("${fsConfig.erpWdShopCode}")
+//    private String shopCode;
 
     @Autowired
     private WdtClient client;
 
+    @Autowired
+    private ConfigUtil configUtil;
+
+
+
+
+
     /**
      * 普通推送
      */
@@ -85,8 +94,9 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
         //测试环境sid、appkey、密钥请到旺店通开放平台-自助对接-申请测试环境内查看，测试环境url=https://sandbox.wangdian.cn/openapi2/
         //调用正式环境时请将sid、appkey、appsecret切换为实际参数，参数在旺店通开放平台-自助对接-应用管理内应用状态为已上线的应用中查看，调用正式环境注意切换正式环境url=https://api.wangdian.cn/openapi2/
 
+        FsErpConfig erpconfig = configUtil.getErpConfig();
         ErpWdtBusinessRequestParams erpWdtBusinessRequestParams = new ErpWdtBusinessRequestParams();
-        erpWdtBusinessRequestParams.setShopNo(shopCode);
+        erpWdtBusinessRequestParams.setShopNo(erpconfig.getErpWdShopCode());
         erpWdtBusinessRequestParams.setSwitchMode(0);
         ErpWdtTrade erpWdtTrade = new ErpWdtTrade();
         FsStoreOrder fsStoreOrder = fsStoreOrderService.selectFsStoreOrderByOrderCode(order.getPlatform_code());
@@ -260,7 +270,7 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
 //        //调用正式环境时请将sid、appkey、appsecret切换为实际参数，参数在旺店通开放平台-自助对接-应用管理内应用状态为已上线的应用中查看，调用正式环境注意切换正式环境url=https://api.wangdian.cn/openapi2/
 //
 //        ErpWdtBusinessRequestParams erpWdtBusinessRequestParams = new ErpWdtBusinessRequestParams();
-//        erpWdtBusinessRequestParams.setShopNo(shopCode);
+//        erpWdtBusinessRequestParams.setShopNo(erpconfig.getErpWdShopCode());
 //        erpWdtBusinessRequestParams.setSwitchMode(0);
 //        ErpWdtTrade erpWdtTrade = new ErpWdtTrade();
 //        FsStoreOrder fsStoreOrder = fsStoreOrderService.selectFsStoreOrderByOrderCode(order.getPlatform_code());
@@ -436,8 +446,9 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
         //测试环境sid、appkey、密钥请到旺店通开放平台-自助对接-申请测试环境内查看，测试环境url=https://sandbox.wangdian.cn/openapi2/
         //调用正式环境时请将sid、appkey、appsecret切换为实际参数，参数在旺店通开放平台-自助对接-应用管理内应用状态为已上线的应用中查看，调用正式环境注意切换正式环境url=https://api.wangdian.cn/openapi2/
 
+        FsErpConfig erpconfig = configUtil.getErpConfig();
         ErpWdtBusinessRequestParams erpWdtBusinessRequestParams = new ErpWdtBusinessRequestParams();
-        erpWdtBusinessRequestParams.setShopNo(shopCode);
+        erpWdtBusinessRequestParams.setShopNo(erpconfig.getErpWdShopCode());
         erpWdtBusinessRequestParams.setSwitchMode(0);
         ErpWdtTrade erpWdtTrade = new ErpWdtTrade();
 
@@ -608,6 +619,7 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
 
     @Override
     public BaseResponse refundUpdate(ErpRefundUpdateRequest param) {
+        FsErpConfig erpconfig = configUtil.getErpConfig();
         log.info("退款单更新: {}", param);
         FsStoreOrder fsStoreOrder = fsStoreOrderService.selectFsStoreOrderByOrderCode(param.getTid());
 
@@ -654,7 +666,7 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
         }
         List<ErpWdtApiRefund> erpWdtApiRefunds = Collections.singletonList(ErpWdtApiRefund.builder()
                 .platformId(127)
-                .shopNo(shopCode)
+                .shopNo(erpconfig.getErpWdShopCode())
                 .tid(param.getTid())
                 .refundNo(param.getTid())
                 .type(RefundTypeEnum.REFUND_BEFORE_SHIPPING.getCode())
@@ -687,8 +699,9 @@ public class WdtErpOrderServiceImpl implements IErpOrderService {
         //测试环境sid、appkey、密钥请到旺店通开放平台-自助对接-申请测试环境内查看，测试环境url=https://sandbox.wangdian.cn/openapi2/
         //调用正式环境时请将sid、appkey、appsecret切换为实际参数，参数在旺店通开放平台-自助对接-应用管理内应用状态为已上线的应用中查看，调用正式环境注意切换正式环境url=https://api.wangdian.cn/openapi2/
 
+        FsErpConfig erpconfig = configUtil.getErpConfig();
         ErpWdtBusinessRequestParams erpWdtBusinessRequestParams = new ErpWdtBusinessRequestParams();
-        erpWdtBusinessRequestParams.setShopNo(shopCode);
+        erpWdtBusinessRequestParams.setShopNo(erpconfig.getErpWdShopCode());
         erpWdtBusinessRequestParams.setSwitchMode(0);
         ErpWdtTrade erpWdtTrade = new ErpWdtTrade();
         FsStoreOrder fsStoreOrder = fsStoreOrderService.selectFsStoreOrderByOrderCode(order.getPlatform_code());

fs-service-system/src/main/java/com/fs/qw/service/impl/CustomerTransferApprovalServiceImpl.java

@@ -239,6 +239,10 @@ public class CustomerTransferApprovalServiceImpl implements ICustomerTransferApp
         item.setProcessedAt(new Date());
 //        审批状态: 0=待审批, 1=审批通过, 2=审批驳回, 3=已撤销
         // 如果审批通过 进行转移
+        List<Long> customerIds1 = JSON.parseArray(item.getCustomerIds(), Long.class);
+        List<TransferCustomDTO> customerList = getCustomerList(customerIds1, item);
+        item.setTransferBefore(JSON.toJSONString(customerList));
+
         if(ObjectUtil.equal(1,item.getApprovalStatus())){
             FsUserTransferParamDTO transferParam = new FsUserTransferParamDTO();
             transferParam.setContent(item.getContent());
@@ -251,9 +255,7 @@ public class CustomerTransferApprovalServiceImpl implements ICustomerTransferApp
 
             fsUserService.transfer(transferParam);
         }
-        List<Long> customerIds = JSON.parseArray(item.getCustomerIds(), Long.class);
-        List<TransferCustomDTO> customerList = getCustomerList(customerIds, item);
-        item.setTransferBefore(JSON.toJSONString(customerList));
+
         return customerTransferApprovalMapper.updateCustomerTransferApproval(item);
     }
 

fs-service-system/src/main/java/com/fs/store/mapper/FsUserMapper.java

@@ -217,7 +217,7 @@ public interface FsUserMapper
     List<FsUserPageListVO> selectFsUserPageListNew(FsUserPageListParam param);
     Long selectFsUserPageListCount(FsUserPageListParam param);
 
-    List<UserListCountVO> getUserNumber(@Param("userId") Long userId);
+    List<UserListCountVO> getUserNumber(@Param("userId") Long userId, @Param("companyId") Long companyId);
 
     int getRepeatUserNumber(@Param("userId") Long userId);
 
@@ -246,9 +246,9 @@ public interface FsUserMapper
 
     void transferCompanyUser(FsUserTransferParamDTO param);
 
-    FsUserSummaryCountVO countUserSummary(@Param("userId") Long userId);
+    FsUserSummaryCountVO countUserSummary(@Param("userId") Long userId, @Param("companyId") Long companyId);
 
-    List<FsUserSummaryCountTagVO> countTag(@Param("userId") Long userId);
+    List<FsUserSummaryCountTagVO> countTag(@Param("userId") Long userId, @Param("companyId") Long companyId);
 
     Map<String, Long> countUserCourse(UserStatisticsCommonParam param);
 
@@ -258,13 +258,13 @@ public interface FsUserMapper
 
     Map<String, Long> countCourseDetails(UserStatisticsCommonParam param);
 
-    List<FsUserRankingVO> countUserRankingByComplete(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsUserRankingVO> countUserRankingByComplete(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
-    List<FsUserRankingVO> countUserRankingByRight(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsUserRankingVO> countUserRankingByRight(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
-    List<FsCourseRankingVO> countCourseRankingByComplete(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsCourseRankingVO> countCourseRankingByComplete(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
-    List<FsCourseRankingVO> countCourseRankingByRight(@Param("userId") Long userId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
+    List<FsCourseRankingVO> countCourseRankingByRight(@Param("userId") Long userId, @Param("companyId") Long companyId, @Param("startTime") String startTime, @Param("endTime") String endTime, @Param("periodId")String periodId, @Param("videoId")String videoId, @Param("order")String order);
 
     List<FsCourseAnalysisCountVO> courseAnalysisCourseCount(CourseAnalysisParam param);
 
@@ -272,9 +272,9 @@ public interface FsUserMapper
 
     List<FsCourseAnalysisCountVO> courseAnalysisAnswerCount(CourseAnalysisParam param);
 
-    CompanyUserSummaryCountVO companyUserCount(@Param("companyUserId")String companyUserId);
+    CompanyUserSummaryCountVO companyUserCount(@Param("companyUserId")String companyUserId, @Param("companyId") Long companyId);
 
-    CompanyUserSummaryCountVO newUserRedPacketCount(@Param("companyUserId")String companyUserId);
+    CompanyUserSummaryCountVO newUserRedPacketCount(@Param("companyUserId")String companyUserId, @Param("companyId") Long companyId);
 
     List<FsUser> getFsUserByCompanyUserAndId(@Param("companyUserId")Long companyUserId, @Param("userId") Long userId);
 

fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreOrderServiceImpl.java

@@ -25,6 +25,7 @@ import com.fs.company.domain.Company;
 import com.fs.company.domain.CompanyDept;
 import com.fs.company.domain.CompanyMoneyLogs;
 import com.fs.company.domain.CompanyUser;
+import com.fs.company.mapper.CompanyMapper;
 import com.fs.company.mapper.CompanyMoneyLogsMapper;
 import com.fs.company.service.ICompanyDeptService;
 import com.fs.company.service.ICompanyService;
@@ -216,6 +217,8 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
     private IFsStoreOrderAuditService orderAuditService;
     @Autowired
     private IFsStoreOrderAuditLogService orderAuditLogService;
+    @Autowired
+    private CompanyMapper companyMapper;
 
     /**
      * 查询订单
@@ -593,6 +596,18 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
                     storeOrder.setStatus(1);
                 }
             }
+            Boolean isPay = true;
+            if (param.getOrderCreateType() != null && param.getOrderCreateType() == 3 && param.getCompanyId()!=null){
+                //后台制单 判断是否需要付款
+                Company company = companyMapper.selectCompanyById(param.getCompanyId());
+                if(company!=null){
+                    if (company.getIsPay() != null && company.getIsPay() == 0) {
+                        //不需要付款
+                        storeOrder.setStatus(1); //待发货
+                        isPay = false;
+                    }
+                }
+            }
             storeOrder.setOrderCreateType(param.getOrderCreateType());
             Long prescribe = carts.stream().filter(item -> item.getProductType()!=null&&item.getProductType()==2).count();
             if(prescribe>0){
@@ -607,6 +622,10 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             if (flag==0) {
                 return R.error("订单创建失败");
             }
+            if (!isPay){
+                // 添加订单审核
+                addOrderAudit(storeOrder);
+            }
             //使用了积分扣积分
             if (dto.getUsedIntegral() > 0) {
                 this.decIntegral(userId, dto.getUsedIntegral(), dto.getDeductionPrice().doubleValue(),storeOrder.getId().toString());
@@ -1010,6 +1029,7 @@ public class FsStoreOrderServiceImpl implements IFsStoreOrderService
             createParam.setPayPrice(param.getPayPrice());
             createParam.setCustomerId(param.getCustomerId());
             createParam.setAmount(param.getAmount());
+            createParam.setOrderCreateType(3); //后台制单
             return this.createOrder(param.getUserId(),createParam);
         }
         else{

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -55,6 +55,7 @@ import com.fs.store.vo.FSUserVO;
 import com.fs.store.vo.FsCompanyUserListQueryVO;
 import com.fs.store.vo.FsUserTuiVO;
 import com.fs.store.vo.h5.*;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
@@ -468,6 +469,15 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
+
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+        if (companyUser!=null && companyUser.isAdmin()){
+            param.setUserId(0L);
+            param.setCompanyId(companyUser.getCompanyId());
+        }
+
+        PageHelper.startPage(param.getPageNum(), param.getPageSize());
+
         List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
 
         // 获取当前销售所有重粉会员
@@ -590,7 +600,14 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public UserListPageVO getUserNumber(Long userId) {
-        List<UserListCountVO> list = fsUserMapper.getUserNumber(userId);
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
+        List<UserListCountVO> list = fsUserMapper.getUserNumber(userId, companyId);
         Map<String, Integer> map = list.stream()
                 .collect(Collectors.toMap(UserListCountVO::getStatus, UserListCountVO::getNum, (v1, v2) -> v1));
         UserListPageVO pageVO = new UserListPageVO();
@@ -617,6 +634,8 @@ public class FsUserServiceImpl implements IFsUserService
         if (countRedPacket != null) {
             vo.setAnswerRedPacketTime(countRedPacket.getAnswerRedPacketTime());
             vo.setAnswerRedPacketAmount(countRedPacket.getAnswerRedPacketAmount());
+        } else {
+            vo.setAnswerRedPacketAmount(BigDecimal.ZERO);
         }
         if (countAnswer != null) {
             vo.setAnswerTime(countAnswer.getAnswerTime());
@@ -664,8 +683,15 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public FsUserSummaryCountVO userSummaryCount(Long userId) {
-        FsUserSummaryCountVO fsUserSummaryCountVO = fsUserMapper.countUserSummary(userId);
-        List<FsUserSummaryCountTagVO> countTagList = fsUserMapper.countTag(userId);
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
+        FsUserSummaryCountVO fsUserSummaryCountVO = fsUserMapper.countUserSummary(userId, companyId);
+        List<FsUserSummaryCountTagVO> countTagList = fsUserMapper.countTag(userId, companyId);
         fsUserSummaryCountVO.setTagList(countTagList);
         return fsUserSummaryCountVO;
     }
@@ -678,6 +704,12 @@ public class FsUserServiceImpl implements IFsUserService
     private FsUserStatisticsVO getUserStatistics(UserStatisticsCommonParam param) {
         FsUserStatisticsVO fsUserStatisticsVO = new FsUserStatisticsVO();
 
+        // 判断是否是管理员
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+        if (companyUser != null && companyUser.isAdmin()){
+            param.setUserId(0L);
+            param.setCompanyId(companyUser.getCompanyId());
+        }
         // 获取课程统计
         Map<String, Long> couserMap = fsUserMapper.countUserCourse(param);
         if (couserMap != null) {
@@ -719,6 +751,11 @@ public class FsUserServiceImpl implements IFsUserService
     public FsUserStatisticsVO userStatisticsDetails(UserStatisticsCommonParam param) {
         FsUserStatisticsVO userStatisticsVO = getUserStatistics(param);
 
+        // 判断是否是管理员
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+        if (companyUser != null && companyUser.isAdmin()){
+            param.setUserId(0L);
+        }
         //统计课程数据详情，在查询统计详情的时候需要显示
         Map<String, Long> courseDetailsMap = fsUserMapper.countCourseDetails(param);
         if(courseDetailsMap != null && courseDetailsMap.get("courseNum") != null && courseDetailsMap.get("videoNum") != null && courseDetailsMap.get("courseUserNum") != null){
@@ -732,25 +769,39 @@ public class FsUserServiceImpl implements IFsUserService
     @Override
     public List<FsUserRankingVO> userRanking(Long userId, String startTime, String endTime, String periodId, String videoId, String order, Integer type) {
         List<FsUserRankingVO> listVO = Collections.emptyList();
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
         if(type == 1){
             //按完播率
-            listVO = fsUserMapper.countUserRankingByComplete(userId, startTime, endTime, periodId, videoId, order);
+            listVO = fsUserMapper.countUserRankingByComplete(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
         if(type == 2){
             //按正确率
-            listVO = fsUserMapper.countUserRankingByRight(userId, startTime, endTime, periodId, videoId, order);
+            listVO = fsUserMapper.countUserRankingByRight(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
         return listVO;
     }
 
     @Override
     public List<FsCourseRankingVO> courseRanking(Long userId, String startTime, String endTime, String periodId, String videoId, String order, Integer type) {
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            userId = 0L;
+            companyId = companyUser.getCompanyId();
+        }
         List<FsCourseRankingVO> list = Collections.emptyList();
         if(type == 1){
-            list = fsUserMapper.countCourseRankingByComplete(userId, startTime, endTime, periodId, videoId, order);
+            list = fsUserMapper.countCourseRankingByComplete(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
         if(type == 2){
-            list = fsUserMapper.countCourseRankingByRight(userId, startTime, endTime, periodId, videoId, order);
+            list = fsUserMapper.countCourseRankingByRight(userId, companyId, startTime, endTime, periodId, videoId, order);
         }
 
         return list;
@@ -822,8 +873,15 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public CompanyUserSummaryCountVO companyUserSummaryCount(Long userId, String companyUserId) {
-        CompanyUserSummaryCountVO companyUserCount = fsUserMapper.companyUserCount(companyUserId);
-        CompanyUserSummaryCountVO newUserRedPacketCount = fsUserMapper.newUserRedPacketCount(companyUserId);
+        // 判断是否是管理员
+        Long companyId = null;
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        if (companyUser != null && companyUser.isAdmin()){
+            companyUserId = String.valueOf(0);
+            companyId = companyUser.getCompanyId();
+        }
+        CompanyUserSummaryCountVO companyUserCount = fsUserMapper.companyUserCount(companyUserId, companyId);
+        CompanyUserSummaryCountVO newUserRedPacketCount = fsUserMapper.newUserRedPacketCount(companyUserId, companyId);
         CompanyUserSummaryCountVO vo = new CompanyUserSummaryCountVO();
         BeanUtils.copyProperties(companyUserCount, vo);
         vo.setUserRedPacketNum(newUserRedPacketCount.getUserRedPacketNum());

fs-service-system/src/main/java/com/fs/store/vo/h5/UserDetailsVO.java

@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
+
 /**
  * 用户会员详情 输出参数
  */
@@ -21,7 +23,7 @@ public class UserDetailsVO {
     private int answerRedPacketTime;
 
     @ApiModelProperty(value = "答题红包金额")
-    private int answerRedPacketAmount;
+    private BigDecimal answerRedPacketAmount;
 
     @ApiModelProperty(value = "完播次数")
     private int completeWatchCount;

fs-service-system/src/main/java/com/fs/wx/pay/config/WxPayProperties.java

@@ -1,8 +1,10 @@
 package com.fs.wx.pay.config;
 
+import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
 @ConfigurationProperties(prefix = "wx.pay")
+@Data
 public class WxPayProperties {
   /**
    * 设置微信公众号或者小程序等的appid
@@ -38,68 +40,12 @@ public class WxPayProperties {
 
   private String notifyUrl;
 
+  private String privateKeyPath;
 
-  public String getV3Key() {
-    return v3Key;
-  }
+  private String privateCertPath;
 
-  public void setV3Key(String v3Key) {
-    this.v3Key = v3Key;
-  }
+  private String certSerialNo;
 
-  public String getAppId() {
-    return appId;
-  }
+  private String nativeNotifyUrl;
 
-  public void setAppId(String appId) {
-    this.appId = appId;
-  }
-
-  public String getMchId() {
-    return mchId;
-  }
-
-  public void setMchId(String mchId) {
-    this.mchId = mchId;
-  }
-
-  public String getMchKey() {
-    return mchKey;
-  }
-
-  public void setMchKey(String mchKey) {
-    this.mchKey = mchKey;
-  }
-
-  public String getSubAppId() {
-    return subAppId;
-  }
-
-  public void setSubAppId(String subAppId) {
-    this.subAppId = subAppId;
-  }
-
-  public String getSubMchId() {
-    return subMchId;
-  }
-
-  public void setSubMchId(String subMchId) {
-    this.subMchId = subMchId;
-  }
-
-  public String getKeyPath() {
-    return keyPath;
-  }
-
-  public void setKeyPath(String keyPath) {
-    this.keyPath = keyPath;
-  }
-
-  public String getNotifyUrl() {
-    return notifyUrl;
-  }
-
-  public void setNotifyUrl(String notifyUrl) {
-    this.notifyUrl = notifyUrl;
-  }
 }

fs-service-system/src/main/resources/application-config-fby.yml

@@ -84,14 +84,17 @@ wx:
         msgDataFormat: JSON
 
   pay:
-    appId: wx11a2ce7c2bbc4521 #微信公众号或者小程序等的appid
-    mchId: 1703311381 #微信支付商户号
-    mchKey: FotTIbIzn4AisMW7de712LJQIazSqqAl #微信支付商户密钥
-    v3Key: y5Eo99q93qzdQRAs6E2BDKIF7f3EnS3G
+    appId: wx961fadab9bcb792b #微信公众号或者小程序等的appid
+    mchId: 1716217886 #微信支付商户号
+    mchKey: a7Fc5B9dE2h8J3kL4mN6pQ7rS9tU2vW1 #微信支付商户密钥
     subAppId:  #服务商模式下的子商户公众账号ID
     subMchId:  #服务商模式下的子商户号
     keyPath: c:\\Tools\\cert\\apiclient_cert.p12 # p12证书的位置，可以指定绝对路径，也可以指定类路径（以classpath:开头）
     notifyUrl:  https://userapp.bly.ylrztop.com/app/wxpay/wxPayNotify
+    privateKeyPath: 'C:\cert\1716217886_20250509_cert\apiclient_key.pem'
+    privateCertPath: 'C:\cert\1716217886_20250509_cert\apiclient_cert.pem'
+    certSerialNo: '4E8BD68BC2BFD37CA58244D660E5FDCCE475D82E'
+    nativeNotifyUrl: 'http://company.fbylive.com/prod-api/pay/wxPay/payNotify'
   mp:
     useRedis: false
     redisConfig:
@@ -120,3 +123,5 @@ tencent_cloud_config:
   proxy: fby
 cloud_host:
   company_name: 福本源
+headerImg:
+  imgUrl:

fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -92,8 +92,8 @@ wx:
       port: 6379
       timeout: 2000
     configs:
-      - appId: wx93ce67750e3cfba3 # 第一个公众号的appid  //公众号名称:云联
-        secret: eddde2a1d4ca0c6c443a67e542b6864c
+      - appId: wx3de90a39feb8107a # 第一个公众号的appid  //公众号名称:中康未来健康服务
+        secret: 473a992e28d5c524b4ff3783559026cb
         token: PPKOdAlCoMO # 接口配置里的Token值
         aesKey: Eswa6VjwtVMCcw03qZy6fWllgrv5aytIA1SZPEU0kU2 # 接口配置里的EncodingAESKey值
 jpush:
@@ -113,3 +113,5 @@ tencent_cloud_config:
   proxy: zkzh
 cloud_host:
   company_name: 中康
+headerImg:
+  imgUrl: https://zkzh-2025.oss-cn-beijing.aliyuncs.com/fs/20250619/e31b5e051a474a7a9b4ad02575b46196.png

fs-service-system/src/main/resources/application-druid-bly-test.yml

@@ -0,0 +1,137 @@
+# 数据源配置
+spring:
+    # redis 配置
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 6379
+        # 密码
+        password:
+        # 连接超时时间
+        timeout: 30s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+        database: 0
+    datasource:
+        mysql:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://113.44.133.86:3306/bly_store_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: bly@2025
+                # 从库数据源
+                slave:
+                    # 从数据源开关/默认关闭
+                    enabled: false
+                    url:
+                    username:
+                    password:
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+        sop:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://113.44.133.86:3306/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: bly@2025
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+rocketmq:
+    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
+    producer:
+        group: my-producer-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+    consumer:
+        group: test-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey

fs-service-system/src/main/resources/application-druid-bly.yml

@@ -1,5 +1,7 @@
 # 数据源配置
 spring:
+    profiles:
+        include: config-bly,common
     # redis 配置
     redis:
         # 地址

fs-service-system/src/main/resources/application-druid-fby.yml

@@ -1,5 +1,7 @@
 # 数据源配置
 spring:
+  profiles:
+    include: common,config-fby
   # redis 配置
   redis:
     # 地址

fs-service-system/src/main/resources/application-druid-zkzh-test.yml

@@ -0,0 +1,139 @@
+# 数据源配置
+spring:
+    profiles:
+        include: config-zkzh,common
+    # redis 配置
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 6379
+        # 密码
+        password:
+        # 连接超时时间
+        timeout: 30s
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                # #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+        database: 0
+    datasource:
+        mysql:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://47.111.26.148:2345/jz_store?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Zkhj951753@#
+                # 从库数据源
+                slave:
+                    # 从数据源开关/默认关闭
+                    enabled: false
+                    url:
+                    username:
+                    password:
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+        sop:
+            type: com.alibaba.druid.pool.DruidDataSource
+            driverClassName: com.mysql.cj.jdbc.Driver
+            druid:
+                # 主库数据源
+                master:
+                    url: jdbc:mysql://47.111.26.148:2345/sop?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+                    username: root
+                    password: Zkhj951753@#
+                # 初始连接数
+                initialSize: 5
+                # 最小连接池数量
+                minIdle: 10
+                # 最大连接池数量
+                maxActive: 20
+                # 配置获取连接等待超时的时间
+                maxWait: 60000
+                # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+                timeBetweenEvictionRunsMillis: 60000
+                # 配置一个连接在池中最小生存的时间，单位是毫秒
+                minEvictableIdleTimeMillis: 300000
+                # 配置一个连接在池中最大生存的时间，单位是毫秒
+                maxEvictableIdleTimeMillis: 900000
+                # 配置检测连接是否有效
+                validationQuery: SELECT 1 FROM DUAL
+                testWhileIdle: true
+                testOnBorrow: false
+                testOnReturn: false
+                webStatFilter:
+                    enabled: true
+                statViewServlet:
+                    enabled: true
+                    # 设置白名单，不填则允许所有访问
+                    allow:
+                    url-pattern: /druid/*
+                    # 控制台管理用户名和密码
+                    login-username: fs
+                    login-password: 123456
+                filter:
+                    stat:
+                        enabled: true
+                        # 慢SQL记录
+                        log-slow-sql: true
+                        slow-sql-millis: 1000
+                        merge-sql: true
+                    wall:
+                        config:
+                            multi-statement-allow: true
+rocketmq:
+    name-server: rmq-1243b25nj.rocketmq.gz.public.tencenttdmq.com:8080 # RocketMQ NameServer 地址
+    producer:
+        group: my-producer-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey
+    consumer:
+        group: test-group
+        access-key: ak1243b25nj17d4b2dc1a03 # 替换为实际的 accessKey
+        secret-key: sk08a7ea1f9f4b0237 # 替换为实际的 secretKey

fs-service-system/src/main/resources/application-druid-zkzh.yml

@@ -1,5 +1,7 @@
 # 数据源配置
 spring:
+    profiles:
+        include: config-zkzh,common
     # redis 配置
     redis:
         # 地址

fs-service-system/src/main/resources/db/upgrade/20250621客户分级.sql

@@ -0,0 +1,14 @@
+-- 客户级别表
+drop table if exists crm_customer_level;
+create table crm_customer_level (
+    `id`        bigint          not null auto_increment comment '主键ID',
+    `name`      varchar(255)    not null                comment '级别名称',
+    `status`    tinyint         default 0               comment '状态 0显示 1停用',
+    `sort`      int             default 0               comment '序号',
+    primary key (`id`) using btree
+) engine = InnoDB comment = '客户级别表';
+
+-- 客户表新增级别字段、置顶字段
+alter table crm_customer
+    add column `customer_level` bigint comment '客户级别' after `customer_type`,
+    add column `is_top` tinyint default 0 comment '是否置顶 0未置顶 1置顶';

fs-service-system/src/main/resources/mapper/company/CompanyMapper.xml

@@ -27,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="isDel"    column="is_del"    />
         <result property="voiceCallerNumber"    column="voice_caller_number"    />
         <result property="omsCode"    column="oms_code"    />
+        <result property="isPay"    column="is_pay"    />
     </resultMap>
 
     <sql id="selectCompanyVo">
@@ -90,6 +91,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">is_del,</if>
             <if test="omsCode != null ">oms_code,</if>
             <if test="voiceCallerNumber != null">voice_caller_number,</if>
+            <if test="isPay != null">is_pay,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyName != null">#{companyName},</if>
@@ -113,6 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isDel != null">#{isDel},</if>
             <if test="omsCode != null ">#{omsCode},</if>
             <if test="voiceCallerNumber != null">#{voiceCallerNumber},</if>
+            <if test="isPay != null">#{isPay},</if>
          </trim>
     </insert>
 
@@ -141,6 +144,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="voiceCallerNumber != null">voice_caller_number = #{voiceCallerNumber},</if>
             <if test="omsCode != null ">oms_code = #{omsCode},</if>
             <if test="fsUserIsDefaultBlack != null ">fs_user_is_default_black = #{fsUserIsDefaultBlack},</if>
+            <if test="isPay != null ">is_pay = #{isPay},</if>
         </trim>
         where company_id = #{companyId}
     </update>

fs-service-system/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -440,12 +440,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAllCompanyUserAndSelf" resultType="CompanyUser">
         SELECT
-            *
+        *
         FROM
-            company_user
-        WHERE
+        company_user
+        <where>
             del_flag = 0
-          AND (company_user.user_id = #{userId} or company_user.parent_id = #{userId})
+            <if test="companyId == null">
+                AND (company_user.user_id = #{userId} or company_user.parent_id = #{userId})
+            </if>
+            <if test="companyId != null">
+                AND company_user.company_id = #{companyId}
+            </if>
+        </where>
     </select>
     <select id="selectQwWatchLogStatisticsListVONewCount" resultType="java.lang.Long">
 

fs-service-system/src/main/resources/mapper/course/FsUserCourseMapper.xml

@@ -267,6 +267,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         inner join fs_course_watch_log fcwl on fcwl.video_id = fucv.video_id
         inner join fs_user fu on fu.user_id = fcwl.user_id
         where fucv.video_id = #{params.videoId}
+        <if test="params.companyId != null">
+            and fcwl.company_id = #{params.companyId}
+        </if>
+        <if test="params.companyUserId != null">
+            and fcwl.company_user_id = #{params.companyUserId}
+        </if>
         <if test="params.keyword != null and params.keyword != ''">
             and (
                 fu.user_id = #{params.keyword}
@@ -278,20 +284,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <choose>
             <when test="params.type == 0">
                 and (
-                    select count(log_id) as count
-                    from fs_course_answer_logs
-                    where user_id = fu.user_id and fcwl.video_id = fucv.video_id and is_right = 1
+                    select count(log.log_id) as count
+                    from fs_course_answer_logs log
+                    where log.user_id = fu.user_id and log.video_id = fucv.video_id and log.is_right = 1
+                ) > 0
+                and (
+                    select count(log.log_id) as count
+                    from fs_course_red_packet_log log
+                    where log.user_id = fu.user_id and log.video_id = fucv.video_id and log.status = 1
                 ) > 0
             </when>
             <when test="params.type == 1">
                 and fcwl.log_type = 2
             </when>
             <when test="params.type == 2">
-                and fcwl.log_type in (1,4)
+                and fcwl.log_type = 4
             </when>
-            <otherwise>
-                and fcwl.log_type = 3
-            </otherwise>
         </choose>
         group by fu.user_id, fucv.video_id, fu.nickname, fu.username, fu.avatar, fu.phone, fu.create_time
     </select>

fs-service-system/src/main/resources/mapper/course/FsUserCourseVideoMapper.xml

@@ -306,9 +306,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.companyId != null">
             and FIND_IN_SET(#{params.companyId}, fcp.company_id)
         </if>
-        <if test="params.dayDate != null">
-            and fcpd.day_date = #{params.dayDate}
-        </if>
+        and (
+            (fcpd.start_date_time &lt;=  CONCAT( CURDATE(), ' 23:59:59' ) and fcpd.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))
+            or (ccut.start_date_time &lt;=  CONCAT( CURDATE(), ' 23:59:59' ) and ccut.end_date_time >= CONCAT( CURDATE(), ' 00:00:00' ))
+            )
         order by video.course_sort
     </select>
     <select id="selectFsUserCourseVideoByVideoIdAndUserId" resultType="com.fs.course.domain.FsUserCourseVideo">

fs-service-system/src/main/resources/mapper/course/FsUserWatchCourseStatisticsMapper.xml

@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="courseId != null "> and course_id = #{courseId}</if>
             <if test="courseName != null  and courseName != ''"> and course_name like concat('%', #{courseName}, '%')</if>
             <if test="videoId != null "> and video_id = #{videoId}</if>
-            <if test="videoTitle != null  and videoTitle != ''"> and video_title = #{videoTitle}</if>
+            <if test="videoTitle != null  and videoTitle != ''"> and video_title like concat('%', #{videoTitle}, '%')</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
@@ -62,6 +62,59 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </where>
     </select>
 
+    <select id="selectFsUserWatchCourseStatisticsListTotal" parameterType="FsUserWatchCourseStatistics" resultMap="FsUserWatchCourseStatisticsResult">
+        SELECT
+        id,
+        period_id,
+        period_name,
+        course_id,
+        course_name,
+        video_id,
+        video_title,
+        company_id,
+        company_name,
+        company_user_id,
+        course_start_date_time,
+        period_starting_time,
+        sum(new_user_num) as new_user_num,
+        sum(user_num) as user_num,
+        sum(watch_num) as watch_num,
+        sum(complete_watch_num) as complete_watch_num ,
+        complete_watch_rate as complete_watch_rate1,
+        ifnull(
+        ROUND(
+        ( sum(complete_watch_num) / sum(watch_num) ) * 100, 2
+        ), 0
+        ) as complete_watch_rate,
+        sum(red_packet_num) as red_packet_num
+        from fs_user_watch_course_statistics
+        <where>
+            <if test="periodId != null "> and period_id = #{periodId}</if>
+            <if test="periodName != null  and periodName != ''"> and period_name like concat('%', #{periodName}, '%')</if>
+            <if test="courseId != null "> and course_id = #{courseId}</if>
+            <if test="courseName != null  and courseName != ''"> and course_name like concat('%', #{courseName}, '%')</if>
+            <if test="videoId != null "> and video_id = #{videoId}</if>
+            <if test="videoTitle != null  and videoTitle != ''"> and video_title like concat('%', #{videoTitle}, '%')</if>
+            <if test="companyId != null "> and company_id = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
+            <if test="companyUserId != null "> and company_user_id = #{companyUserId}</if>
+            <if test="courseStartDateTime != null "> and course_start_date_time like concat(DATE(#{courseStartDateTime}),'%')</if>
+            <if test="companyUserName != null  and companyUserName != ''"> and company_user_name like concat('%', #{companyUserName}, '%')</if>
+            <if test="periodStartingTime != null "> and period_starting_time like concat(DATE(#{periodStartingTime}), '%')</if>
+            <if test="newUserNum != null "> and new_user_num = #{newUserNum}</if>
+            <if test="userNum != null "> and user_num = #{userNum}</if>
+            <if test="watchNum != null "> and watch_num = #{watchNum}</if>
+            <if test="completeWatchNum != null "> and complete_watch_num = #{completeWatchNum}</if>
+            <if test="completeWatchRate != null "> and complete_watch_rate = #{completeWatchRate}</if>
+            <if test="answerNum != null "> and answer_num = #{answerNum}</if>
+            <if test="answerRightNum != null "> and answer_right_num = #{answerRightNum}</if>
+            <if test="answerRightRate != null "> and answer_right_rate = #{answerRightRate}</if>
+            <if test="redPacketNum != null "> and red_packet_num = #{redPacketNum}</if>
+            <if test="redPacketAmount != null "> and red_packet_amount = #{redPacketAmount}</if>
+        </where>
+        group by fs_user_watch_course_statistics.company_id, course_start_date_time
+    </select>
+
     <select id="selectFsUserWatchCourseStatisticsById" parameterType="Long" resultMap="FsUserWatchCourseStatisticsResult">
         <include refid="selectFsUserWatchCourseStatisticsVo"/>
         where id = #{id}

fs-service-system/src/main/resources/mapper/course/FsUserWatchStatisticsMapper.xml

@@ -9,6 +9,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="periodId"    column="period_id"    />
         <result property="periodName"    column="period_name"    />
         <result property="periodStartingTime"    column="period_starting_time"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="companyName"    column="company_name"    />
         <result property="newUserNum"    column="new_user_num"    />
         <result property="userNum"    column="user_num"    />
         <result property="watchNum"    column="watch_num"    />
@@ -17,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectFsUserWatchStatisticsVo">
-        select id, period_id, period_name, period_starting_time, new_user_num, user_num, watch_num, complete_watch_num, complete_watch_rate from fs_user_watch_statistics
+        select id, period_id, period_name, period_starting_time, new_user_num, user_num, watch_num, complete_watch_num, complete_watch_rate, company_id, company_name from fs_user_watch_statistics
     </sql>
 
     <select id="selectFsUserWatchStatisticsList" parameterType="FsUserWatchStatistics" resultMap="FsUserWatchStatisticsResult">
@@ -26,6 +28,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null "> and period_id = #{periodId}</if>
             <if test="periodName != null  and periodName != ''"> and period_name like concat('%', #{periodName}, '%')</if>
             <if test="periodStartingTime != null "> and period_starting_time = #{periodStartingTime}</if>
+            <if test="companyId != null and companyId !='' "> and company_id = #{companyId}</if>
+            <if test="companyName != null  and companyName != ''"> and company_name like concat('%', #{companyName}, '%')</if>
             <if test="newUserNum != null "> and new_user_num = #{newUserNum}</if>
             <if test="userNum != null "> and user_num = #{userNum}</if>
             <if test="watchNum != null "> and watch_num = #{watchNum}</if>
@@ -45,6 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null">period_id,</if>
             <if test="periodName != null">period_name,</if>
             <if test="periodStartingTime != null">period_starting_time,</if>
+            <if test="companyId != null and companyId !='' ">company_id,</if>
+            <if test="companyName != null">company_name,</if>
             <if test="newUserNum != null">new_user_num,</if>
             <if test="userNum != null">user_num,</if>
             <if test="watchNum != null">watch_num,</if>
@@ -55,6 +61,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null">#{periodId},</if>
             <if test="periodName != null">#{periodName},</if>
             <if test="periodStartingTime != null">#{periodStartingTime},</if>
+            <if test="companyId != null and companyId !='' ">#{companyId},</if>
+            <if test="companyName != null">#{companyName},</if>
             <if test="newUserNum != null">#{newUserNum},</if>
             <if test="userNum != null">#{userNum},</if>
             <if test="watchNum != null">#{watchNum},</if>
@@ -69,6 +77,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null">period_id = #{periodId},</if>
             <if test="periodName != null">period_name = #{periodName},</if>
             <if test="periodStartingTime != null">period_starting_time = #{periodStartingTime},</if>
+            <if test="companyId != null and companyId !='' ">company_id = #{companyId},</if>
+            <if test="companyName != null">company_name = #{companyName},</if>
             <if test="newUserNum != null">new_user_num = #{newUserNum},</if>
             <if test="userNum != null">user_num = #{userNum},</if>
             <if test="watchNum != null">watch_num = #{watchNum},</if>
@@ -103,10 +113,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             ) AS completeWatchRate,
             fwl.period_id
             ,fs_user_course_period.period_name,
-            fs_user_course_period.period_starting_time
+            fs_user_course_period.period_starting_time,
+            fs_user_course_period.company_id,
+            GROUP_CONCAT(DISTINCT company.company_name) company_name
         FROM
             fs_course_watch_log fwl
                 LEFT JOIN fs_user_course_period ON fwl.period_id = fs_user_course_period.period_id
+                LEFT JOIN company ON FIND_IN_SET( company.company_id, fs_user_course_period.company_id ) > 0
         WHERE
             fwl.send_type = 1
             and fs_user_course_period.period_name is not null
@@ -120,6 +133,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null">period_id,</if>
             <if test="periodName != null">period_name,</if>
             <if test="periodStartingTime != null">period_starting_time,</if>
+            <if test="companyId != null and companyId !='' ">company_id,</if>
+            <if test="companyName != null">company_name,</if>
             <if test="newUserNum != null">new_user_num,</if>
             <if test="userNum != null">user_num,</if>
             <if test="watchNum != null">watch_num,</if>
@@ -131,6 +146,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="periodId != null">#{periodId},</if>
             <if test="periodName != null">#{periodName},</if>
             <if test="periodStartingTime != null">#{periodStartingTime},</if>
+            <if test="companyId != null and companyId !='' ">#{companyId},</if>
+            <if test="companyName != null">#{companyName},</if>
             <if test="newUserNum != null">#{newUserNum},</if>
             <if test="userNum != null">#{userNum},</if>
             <if test="watchNum != null">#{watchNum},</if>
@@ -140,6 +157,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </trim>
         on duplicate key update
         <trim suffixOverrides=",">
+            <if test="companyId != null and companyId !='' ">company_id = #{companyId},</if>
+            <if test="companyName != null">company_name = #{companyName},</if>
             <if test="newUserNum != null">new_user_num = #{newUserNum},</if>
             <if test="userNum != null">user_num = #{userNum},</if>
             <if test="watchNum != null">watch_num = #{watchNum},</if>

fs-service-system/src/main/resources/mapper/crm/CrmCustomerAssistMapper.xml

@@ -11,10 +11,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="companyUserName"    column="company_user_name"    />
         <result property="customerId"    column="customer_id"    />
         <result property="createTime"    column="create_time"    />
+        <result property="rate"    column="rate"    />
     </resultMap>
 
     <sql id="selectCrmCustomerAssistVo">
-        select id, company_id, company_user_id,company_user_name, customer_id, create_time from crm_customer_assist
+        select id, company_id, company_user_id,company_user_name, customer_id, create_time,rate from crm_customer_assist
     </sql>
 
     <select id="selectCrmCustomerAssistList" parameterType="CrmCustomerAssist" resultMap="CrmCustomerAssistResult">
@@ -32,7 +33,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </select>
     <select id="selectCompanyUserNameByCustomerId" resultType="java.lang.String">
-        select  CONCAT(company_user_name, '(', company_user_id, ')') AS assistUser
+        select  CONCAT(company_user_name, '(', company_user_id, ')','分佣:',rate,'%') AS assistUser
         from crm_customer_assist
         where customer_id = #{customerId}
     </select>
@@ -42,6 +43,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCompanyUserIdByCustomerId" resultType="java.lang.Long">
         select company_user_id from crm_customer_assist where customer_id = #{customerId} and create_time &lt; #{createTime}
     </select>
+    <select id="selectByCustomerId" resultType="com.fs.crm.domain.CrmCustomerAssist">
+        <include refid="selectCrmCustomerAssistVo"/>
+        where  customer_id = #{customerId}
+
+    </select>
 
     <insert id="insertCrmCustomerAssist" parameterType="CrmCustomerAssist" useGeneratedKeys="true" keyProperty="id">
         insert into crm_customer_assist
@@ -51,6 +57,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserName != null">company_user_name,</if>
             <if test="customerId != null">customer_id,</if>
             <if test="createTime != null">create_time,</if>
+            <if test="rate != null">rate,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="companyId != null">#{companyId},</if>
@@ -58,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserName != null">#{companyUserName},</if>
             <if test="customerId != null">#{customerId},</if>
             <if test="createTime != null">#{createTime},</if>
+            <if test="rate != null">#{rate},</if>
          </trim>
     </insert>
 
@@ -69,6 +77,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserName != null">company_user_name = #{companyUserName},</if>
             <if test="customerId != null">customer_id = #{customerId},</if>
             <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="rate != null">rate = #{rate},</if>
         </trim>
         where id = #{id}
     </update>

fs-service-system/src/main/resources/mapper/crm/CrmCustomerLevelMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fs.crm.mapper.CrmCustomerLevelMapper">
+
+    <select id="selectCrmCustomerLevelVOList" resultType="com.fs.crm.vo.CrmCustomerLevelVO">
+        select
+            ccl.*
+        from crm_customer_level ccl
+        <where>
+            <if test="name != null and name != ''">
+                and ccl.name like concat('%', #{name}, '%')
+            </if>
+        </where>
+    </select>
+</mapper>

fs-service-system/src/main/resources/mapper/crm/CrmCustomerMapper.xml

@@ -54,10 +54,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="volume"    column="volume"    />
         <result property="thirdAccount"    column="third_account"    />
         <result property="clueId"    column="clue_id"    />
+        <result property="customerLevel"    column="customer_level"    />
+        <result property="isTop"    column="is_top"    />
     </resultMap>
 
     <sql id="selectCrmCustomerVo">
-        select customer_id, customer_code, customer_name, mobile, sex, weixin, remark, user_id, create_user_id, receive_user_id, customer_user_id, address,city_ids, location, detail_address, lng, lat, create_time, update_time, status, is_receive, dept_id, is_del, customer_type, receive_time, pool_time, company_id, is_line, source, tags,ext_json,visit_status,register_date,register_link_url,register_desc,register_submit_time,is_pool,register_type,pay_money,buy_count,source_code,push_time,push_code,visit_time,traffic_source,import_type,third_account,clue_id from crm_customer
+        select customer_id, customer_code, customer_name, mobile, sex, weixin, remark, user_id, create_user_id, receive_user_id, customer_user_id, address,city_ids, location, detail_address, lng, lat, create_time, update_time, status, is_receive, dept_id, is_del, customer_type, receive_time, pool_time, company_id, is_line, source, tags,ext_json,visit_status,register_date,register_link_url,register_desc,register_submit_time,is_pool,register_type,pay_money,buy_count,source_code,push_time,push_code,visit_time,traffic_source,import_type,third_account,clue_id,customer_level,is_top from crm_customer
     </sql>
 
     <select id="selectCrmCustomerList" parameterType="CrmCustomer" resultMap="CrmCustomerResult">
@@ -93,6 +95,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="importType != null "> and import_type = #{importType}</if>
             <if test="thirdAccount != null "> and third_account = #{thirdAccount}</if>
             <if test="clueId != null "> and clue_id = #{clueId}</if>
+            <if test="customerLevel != null "> and customer_level = #{customerLevel}</if>
+            <if test="isTop != null "> and is_top = #{isTop}</if>
         </where>
         order by customer_id desc
     </select>
@@ -157,6 +161,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="importType != null">import_type,</if>
             <if test="thirdAccount != null">third_account,</if>
             <if test="clueId != null">clue_id,</if>
+            <if test="customerLevel != null">customer_level,</if>
+            <if test="isTop != null">is_top,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="customerCode != null">#{customerCode},</if>
@@ -206,6 +212,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="importType != null">#{importType},</if>
             <if test="thirdAccount != null">#{thirdAccount},</if>
             <if test="clueId != null">#{clueId},</if>
+            <if test="customerLevel != null">#{customerLevel},</if>
+            <if test="isTop != null">#{isTop},</if>
          </trim>
     </insert>
 
@@ -259,6 +267,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="importType != null">import_type = #{importType},</if>
             <if test="thirdAccount != null">third_account = #{thirdAccount},</if>
             <if test="clueId != null">clue_id = #{clueId},</if>
+            <if test="customerLevel != null">customer_level = #{customerLevel},</if>
+            <if test="isTop != null">is_top = #{isTop},</if>
         </trim>
         where customer_id = #{customerId}
     </update>
@@ -293,13 +303,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCrmMyCustomerListQuery" resultType="com.fs.crm.vo.CrmMyCustomerListQueryVO">
         select cu.*,c.create_time as customer_create_time,c.visit_status,c.remark,c.register_desc,c.register_submit_time,
                c.customer_code,c.customer_name,c.mobile,c.sex,c.weixin,c.address,c.is_receive,c.customer_type,c.source,
-               c.tags,c.receive_time
+               c.tags,c.receive_time,c.customer_level
         from crm_customer_user cu
             inner join crm_customer c on c.customer_user_id=cu.customer_user_id
         where cu.is_pool=0  and c.is_del = 0
         <if test="maps.companyId != null">
             and cu.company_id =#{maps.companyId}
         </if>
+        <if test="maps.customerLevel != null">
+            and c.customer_level =#{maps.customerLevel}
+        </if>
         <if test="maps.companyUserId != null">
             and cu.company_user_id =#{maps.companyUserId}
         </if>
@@ -359,7 +372,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectCrmMyAssistListQuery" resultType="com.fs.crm.vo.CrmMyCustomerListQueryVO">
         select cu.*,c.create_time as customer_create_time,c.visit_status,c.remark,c.register_desc,c.register_submit_time,
         c.customer_code,c.customer_name,c.mobile,c.sex,c.weixin,c.address,c.is_receive,c.customer_type,c.source,
-        c.tags,c.receive_time
+        c.tags,c.receive_time, c.customer_level
         from crm_customer_assist ca
         LEFT JOIN  crm_customer c on c.customer_id=ca.customer_id
         LEFT JOIN crm_customer_user cu on c.customer_user_id=cu.customer_user_id
@@ -370,6 +383,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="maps.companyUserId != null">
             and ca.company_user_id =#{maps.companyUserId}
         </if>
+        <if test="maps.customerLevel != null">
+            and c.customer_level =#{maps.customerLevel}
+        </if>
         <if test="maps.address != null and  maps.address != ''">
             and c.address like CONCAT('%',#{maps.address},'%')
         </if>

fs-service-system/src/main/resources/mapper/statis/ConsumptionBalanceMapper.xml

@@ -278,14 +278,12 @@
             <if test="dataType == 1">
                 rpl.course_id as course_id,
             </if>
-            SUM(rpl.money) as rewardMoney
+            SUM(rpl.amount) as rewardMoney
         FROM
-            company_red_package_logs rpl
-        left join fs_course_watch_log log
-        on rpl.watch_log_id=log.log_id
+            fs_course_red_packet_log rpl
+            left join fs_course_watch_log log
+            on rpl.watch_log_id=log.log_id
         <where>
-            rpl.operate_type = 1
-            AND rpl.status = 1
             <if test="startTime != null">
                 AND rpl.create_time <![CDATA[>=]]> #{startTime}
             </if>
@@ -320,8 +318,8 @@
         <if test="type == 2 or type == 3 or type == 4">
             DATE_FORMAT(rpl.create_time, '%Y-%m-%d') AS start_date,
         </if>
-               SUM(rpl.money) as rewardMoney
-        from company_red_package_logs rpl
+            SUM(rpl.amount) as rewardMoney
+        from fs_course_red_packet_log rpl
         left join fs_course_watch_log log
         on rpl.watch_log_id=log.log_id
         <where>
@@ -337,8 +335,6 @@
             <if test="companyId != null">
                 and log.company_id = ${companyId}
             </if>
-            AND rpl.operate_type = 1
-            AND rpl.status = 1
         </where>
         group by start_date
     </select>