Merge branch 'refs/heads/master' into openIm

# Conflicts:
#	fs-service/src/main/java/com/fs/course/service/impl/FsUserCourseVideoServiceImpl.java
#	fs-service/src/main/java/com/fs/his/mapper/FsUserMapper.java

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

@@ -132,6 +132,7 @@ public class CompanyController extends BaseController
                 callerService.updateCompanyVoiceCaller(caller);
             }
         }
+        company.setUpdateMiniApp(true);
         return toAjax(companyService.updateCompany(company));
     }
 

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

@@ -220,10 +220,11 @@ public class FsUserCoursePeriodController extends BaseController {
     public R periodCourseCount(@RequestBody PeriodCountParam param) {
         PageHelper.startPage(param.getPageNum(), param.getPageSize());
         List<FsPeriodCountVO> list = fsUserCoursePeriodDaysService.periodCourseCount(param);
+        long count = fsUserCoursePeriodDaysService.periodCourseByCount(param);
         PageInfo<FsPeriodCountVO> pageInfo = new PageInfo<>(list);
         Map<String, Object> result = new HashMap<>();
         result.put("rows", pageInfo.getList());
-        result.put("total", pageInfo.getTotal());
+        result.put("total", count);
         return R.ok(result);
     }
 

fs-admin/src/main/java/com/fs/his/controller/FsCityController.java

@@ -129,4 +129,10 @@ public class FsCityController extends BaseController
         return R.ok().put("data",fsCityService.getCitysArea());
     }
 
+    @GetMapping("/getAllList")
+    public R getAllList(FsCity fsCity)
+    {
+        List<FsCity> list = fsCityService.selectFsCityList(fsCity);
+        return R.ok().put("data",list);
+    }
 }

fs-admin/src/main/java/com/fs/his/controller/FsCompanyController.java

@@ -145,6 +145,7 @@ public class FsCompanyController extends BaseController
     public AjaxResult edit(@RequestBody Company company)
     {
         company.setMoney(null);
+        company.setUpdateMiniApp(true);
         return toAjax(companyService.updateCompany(company));
     }
 

fs-admin/src/main/java/com/fs/his/controller/FsInquiryPatientInfoController.java

@@ -0,0 +1,52 @@
+package com.fs.his.controller;
+
+
+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.his.param.FsInquiryPatientParam;
+import com.fs.his.service.IFsInquiryPatientInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * 问诊患者信息(FsInquiryPatientInfo)
+ */
+@RestController
+@RequestMapping("/his/inquiryPatientInfo")
+public class FsInquiryPatientInfoController extends BaseController {
+
+
+    @Autowired
+    private IFsInquiryPatientInfoService patientInfoService;
+
+
+
+
+    /**
+     * 新增患者问诊信息
+     */
+    @PreAuthorize("@ss.hasPermi('his:inquiryPatientInfo:add')")
+    @Log(title = "患者问诊信息", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody FsInquiryPatientParam param){
+        return toAjax(patientInfoService.insertFsInquiryPatientInfo(param));
+    }
+
+    /**
+     * 修改患者问诊信息
+     */
+    @PreAuthorize("@ss.hasPermi('his:inquiryPatientInfo:edit')")
+    @Log(title = "患者问诊信息", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FsInquiryPatientParam param){
+        return toAjax(patientInfoService.updateFsInquiryPatientInfo(param));
+    }
+
+    @GetMapping("/detail/{inquiryOrderId}")
+    public AjaxResult get(@PathVariable("inquiryOrderId") Long inquiryOrderId){
+        return AjaxResult.success(patientInfoService.selectFsInquiryPatientInfo(inquiryOrderId));
+    }
+}

fs-admin/src/main/java/com/fs/his/controller/FsStoreOrderController.java

@@ -108,6 +108,9 @@ public class FsStoreOrderController extends BaseController
     @Autowired
     @Qualifier("JSTErpOrderServiceImpl")
     private IErpOrderService jSTOrderService;
+    @Autowired
+    @Qualifier("k9OrderScrmServiceImpl")
+    private IErpOrderService k9OrderService;
 
     @Autowired
     SysConfigMapper sysConfigMapper;
@@ -475,6 +478,8 @@ public class FsStoreOrderController extends BaseController
                     erpOrderService =  dfOrderService;
                 }else if(erpType == 5){
                     erpOrderService=jSTOrderService;
+                }else if(erpType == 6){
+                    erpOrderService=k9OrderService;
                 }
                 return erpOrderService;
 

fs-admin/src/main/java/com/fs/his/controller/FsStorePaymentController.java

@@ -11,6 +11,7 @@ import com.fs.his.param.FsStorePaymentParam;
 import com.fs.his.service.IFsExportTaskService;
 import com.fs.his.vo.FsStorePaymentExcelVO;
 import com.fs.his.vo.FsStorePaymentVO;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -38,6 +39,7 @@ import com.fs.common.core.page.TableDataInfo;
  */
 @RestController
 @RequestMapping("/his/storePayment")
+@Slf4j
 public class FsStorePaymentController extends BaseController
 {
     @Autowired
@@ -131,7 +133,7 @@ public class FsStorePaymentController extends BaseController
     @GetMapping(value = "refund/{paymentId}")
     public R refund(@PathVariable("paymentId") Long paymentId)
     {
-
+        log.info("sysUserId： {} 提交退款", getUserId());
         return fsStorePaymentService.refundFsStorePayment(paymentId);
     }
 

fs-admin/src/main/java/com/fs/his/controller/FsStoreProductPackageController.java

@@ -153,7 +153,6 @@ public class FsStoreProductPackageController extends BaseController
         JSONArray jsonArray=JSONUtil.parseArray(fsStoreProductPackage.getProductList());
         List<StorePackageProductDTO> goodsList=JSONUtil.toList(jsonArray, StorePackageProductDTO.class);
         fsStoreProductPackage.setProducts(JSONUtil.toJsonStr(goodsList));
-        fsStoreProductPackage.setCompanyId(0l);
 
         return toAjax(fsStoreProductPackageService.insertFsStoreProductPackage(fsStoreProductPackage));
     }

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

@@ -144,8 +144,21 @@ public class FsUserController extends BaseController
     {
         startPage();
         List<FsUserVO> list = fsUserService.selectFsUserVOListByProject(fsUser);
-        for (FsUserVO vo : list){
-            vo.setPhone(ParseUtils.parsePhone(vo.getPhone()));
+        boolean checkPhone = isCheckPhone();
+        for (FsUserVO fsUserVO : list) {
+            if(fsUserVO.getPhone() != null&&fsUserVO.getPhone()!=""){
+                if (!checkPhone){
+                    if (fsUserVO.getPhone().length()>11){
+                        fsUserVO.setPhone(decryptPhoneMk(fsUserVO.getPhone()));
+                    }else {
+                        fsUserVO.setPhone(fsUserVO.getPhone().replaceAll("(\\d{3})\\d*(\\d{4})", "$1****$2"));
+                    }
+                } else {
+                    if (fsUserVO.getPhone().length()>11) {
+                        fsUserVO.setPhone(decryptPhone(fsUserVO.getPhone()));
+                    }
+                }
+            }
         }
         return getDataTable(list);
     }

fs-admin/src/main/java/com/fs/his/task/Task.java

@@ -1066,6 +1066,9 @@ public class Task {
     @Autowired
     @Qualifier("JSTErpOrderServiceImpl")
     private IErpOrderService jSTOrderService;
+    @Autowired
+    @Qualifier("k9OrderScrmServiceImpl")
+    private IErpOrderService k9OrderService;
 
     private IErpOrderService getErpService() {
         FsSysConfig sysConfig = configUtil.getSysConfig();
@@ -1089,6 +1092,8 @@ public class Task {
                     erpOrderService =  dfOrderService;
                 }else if(erpType == 5){
                     erpOrderService=jSTOrderService;
+                }else if(erpType == 6){
+                    erpOrderService=k9OrderService;
                 }
                 return erpOrderService;
 

fs-admin/src/main/java/com/fs/hisStore/FsMaterialGroupScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsMaterialGroupScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsMaterialScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsMaterialScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsMenuScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsMenuScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsPrescribeDrugScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsPrescribeDrugScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsPrescribeScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsPrescribeScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsShippingTemplatesFreeScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsShippingTemplatesFreeScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsShippingTemplatesRegionScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsShippingTemplatesRegionScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsShippingTemplatesScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsShippingTemplatesScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreActivityScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreActivityScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -25,7 +25,7 @@ import java.util.List;
  * @date 2022-11-18
  */
 @RestController
-@RequestMapping("/store/store/storeActivity")
+@RequestMapping("/store/storeActivity")
 public class FsStoreActivityScrmController extends BaseController
 {
     @Autowired

fs-admin/src/main/java/com/fs/hisStore/FsStoreAfterSalesItemScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreAfterSalesItemScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreAfterSalesScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreAfterSalesScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreAfterSalesStatusScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreAfterSalesStatusScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreCanvasScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreCanvasScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreCartScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreCartScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreCouponIssueScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreCouponIssueScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -22,7 +22,7 @@ import java.util.List;
  * @date 2022-03-15
  */
 @RestController
-@RequestMapping("/store/store/storeCouponIssue")
+@RequestMapping("/store/storeCouponIssue")
 public class FsStoreCouponIssueScrmController extends BaseController
 {
     @Autowired

fs-admin/src/main/java/com/fs/hisStore/FsStoreCouponIssueUserScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreCouponIssueUserScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -21,7 +21,7 @@ import java.util.List;
  * @date 2022-03-15
  */
 @RestController
-@RequestMapping("/store/store/storeCouponIssueUser")
+@RequestMapping("/store/storeCouponIssueUser")
 public class FsStoreCouponIssueUserScrmController extends BaseController
 {
     @Autowired

fs-admin/src/main/java/com/fs/hisStore/FsStoreCouponScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreCouponScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -26,7 +26,7 @@ import java.util.List;
  * @date 2022-03-15
  */
 @RestController
-@RequestMapping("/store/store/storeCoupon")
+@RequestMapping("/store/storeCoupon")
 public class FsStoreCouponScrmController extends BaseController
 {
     @Autowired

fs-admin/src/main/java/com/fs/hisStore/FsStoreCouponUserScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreCouponUserScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -23,7 +23,7 @@ import java.util.List;
  * @date 2022-03-15
  */
 @RestController
-@RequestMapping("/store/store/storeCouponUser")
+@RequestMapping("/store/storeCouponUser")
 public class FsStoreCouponUserScrmController extends BaseController
 {
     @Autowired

fs-admin/src/main/java/com/fs/hisStore/FsStoreHealthOrderScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreHealthOrderScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;
@@ -6,11 +6,13 @@ import com.alibaba.fastjson.JSONObject;
 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.StringUtils;
 import com.fs.common.utils.poi.ExcelUtil;
 import com.fs.company.service.ICompanyMoneyLogsService;
+import com.fs.course.dto.FsOrderDeliveryNoteDTO;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.his.service.IFsUserService;
 import com.fs.hisStore.dto.StoreOrderProductDTO;
@@ -21,9 +23,8 @@ import com.fs.hisStore.vo.FsStoreOrderItemExportVO;
 import com.fs.hisStore.vo.FsStoreOrderVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -51,6 +52,12 @@ public class FsStoreHealthOrderScrmController extends BaseController {
     @Autowired
     private ICompanyMoneyLogsService moneyLogsService;
 
+    // 允许的文件扩展名
+    private static final String[] ALLOWED_EXCEL_EXTENSIONS = {".xlsx", ".xls"};
+
+    // 最大文件大小（5MB）
+    private static final long MAX_FILE_SIZE = 5 * 1024 * 1024; // 5MB
+
     /**
      * 查询健康商城订单列表
      */
@@ -91,7 +98,7 @@ public class FsStoreHealthOrderScrmController extends BaseController {
     @Log(title = "健康商城订单", businessType = BusinessType.EXPORT)
     @GetMapping("/healthExport")
     public AjaxResult export1(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }
@@ -130,10 +137,10 @@ public class FsStoreHealthOrderScrmController extends BaseController {
 
 
     @PreAuthorize("@ss.hasPermi('store:healthStoreOrder:exportItems')")
-    @Log(title = "健康商城订单明细导出", businessType = BusinessType.EXPORT)
+    @Log(title = "商城订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/healthExportItems")
     public AjaxResult exportItems1(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }
@@ -173,4 +180,52 @@ public class FsStoreHealthOrderScrmController extends BaseController {
         ExcelUtil<FsStoreOrderItemExportVO> util = new ExcelUtil<FsStoreOrderItemExportVO>(FsStoreOrderItemExportVO.class);
         return util.exportExcel(list, "订单明细数据");
     }
+
+    //订单发货批量导入
+    @Log(title = "发货同步导入", businessType = BusinessType.IMPORT)
+    @PostMapping("/importDeliveryNoteExpress")
+    public R importDeliveryNoteExpress(@RequestParam("file") MultipartFile file) {
+        // 1. 检查文件是否为空
+        if (file.isEmpty()) {
+            return R.error("上传的文件不能为空");
+        }
+        // 2. 检查文件大小
+        if (file.getSize() > MAX_FILE_SIZE) {
+            return R.error("文件大小不能超过5MB");
+        }
+        // 3. 检查文件扩展名
+        String fileName = file.getOriginalFilename();
+        if (fileName == null || !isValidExcelFile(fileName)) {
+            return R.error("请上传Excel文件（.xlsx或.xls格式）");
+        }
+
+        ExcelUtil<FsOrderDeliveryNoteDTO> util=new ExcelUtil<>(FsOrderDeliveryNoteDTO.class);
+        try {
+            List<FsOrderDeliveryNoteDTO> dtoList = util.importExcel(file.getInputStream());
+            if(!dtoList.isEmpty()){
+                fsStoreOrderService.importDeliveryNoteExpress(dtoList);
+            }else {
+                R.error("操作失败，导入数据不能小于1条！");
+            }
+        }catch (Exception e){
+            e.getStackTrace();
+        }
+        return R.ok();
+    }
+
+    @GetMapping("/importDeliveryNoteExpressTemplate")
+    public AjaxResult importTemplate() {
+        ExcelUtil<FsOrderDeliveryNoteDTO> util = new ExcelUtil<>(FsOrderDeliveryNoteDTO.class);
+        return util.importTemplateExcel("订单发货导入模板");
+    }
+
+    // 检查文件是否为有效的Excel文件
+    private boolean isValidExcelFile(String fileName) {
+        for (String ext : ALLOWED_EXCEL_EXTENSIONS) {
+            if (fileName.toLowerCase().endsWith(ext)) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderAuditScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderAuditScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderItemScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderItemScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderNoticeScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderNoticeScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderOfflineItemScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderOfflineItemScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderOfflineScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderOfflineScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderPromotionScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderPromotionScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 
 import cn.hutool.core.bean.BeanUtil;

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.StrUtil;
@@ -84,11 +84,19 @@ public class FsStoreOrderScrmController extends BaseController {
     @Autowired
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtOrderService;
-
+    @Autowired
+    @Qualifier("hzOMSErpOrderServiceImpl")
+    private IErpOrderService hzOMSErpOrderService;
+    @Autowired
+    @Qualifier("dfOrderServiceImpl")
+    private IErpOrderService dfOrderService;
     @Autowired
     @Qualifier("k9OrderScrmServiceImpl")
     private IErpOrderService k9OrderService;
     @Autowired
+    @Qualifier("JSTErpOrderServiceImpl")
+    private IErpOrderService jSTOrderService;
+    @Autowired
     private ConfigUtil configUtil;
     @Autowired
     private IFsStoreOrderAuditLogScrmService orderAuditLogService;
@@ -102,15 +110,22 @@ public class FsStoreOrderScrmController extends BaseController {
             //判断erp类型
             Integer erpType = erpConfig.getErpType();
             if (erpType != null) {
-                if (erpType == 1) {
+                if (erpType == 1){
                     //管易
-                    erpOrderService = gyOrderService;
-                } else if (erpType == 2) {
-                    //旺店通
-                    erpOrderService = wdtOrderService;
-                } else if (erpType == 3) {
+                    erpOrderService =  gyOrderService;
+                } else if (erpType == 2){
                     //旺店通
-                    erpOrderService = k9OrderService;
+                    erpOrderService =  wdtOrderService;
+                } else if (erpType == 3){
+                    //
+                    erpOrderService =  hzOMSErpOrderService;
+                } else if (erpType == 4){
+                    //代服
+                    erpOrderService =  dfOrderService;
+                }else if(erpType == 5){
+                    erpOrderService=jSTOrderService;
+                }else if(erpType == 6){
+                    erpOrderService=k9OrderService;
                 }
             }
         }
@@ -217,7 +232,7 @@ public class FsStoreOrderScrmController extends BaseController {
     @Log(title = "订单", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }
@@ -262,7 +277,7 @@ public class FsStoreOrderScrmController extends BaseController {
     @Log(title = "订单明细导出", businessType = BusinessType.EXPORT)
     @GetMapping("/exportItems")
     public AjaxResult exportItems(FsStoreOrderParam param) {
-        if (param.getBeginTime().equals("") && param.getEndTime().equals("")){
+        if ("".equals(param.getBeginTime()) && "".equals(param.getEndTime())){
             param.setBeginTime(null);
             param.setEndTime(null);
         }

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderStatisticsScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderStatisticsScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.baomidou.mybatisplus.extension.api.R;
 import com.fs.hisStore.param.FsStoreOrderStatisticsParam;

fs-admin/src/main/java/com/fs/hisStore/FsStoreOrderStatusScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderStatusScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStorePaymentScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStorePaymentScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import cn.hutool.json.JSONUtil;
 import com.alipay.api.AlipayApiException;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductAttrScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductAttrScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductAttrValueScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductAttrValueScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductCategoryScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductCategoryScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductDetailsScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductDetailsScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductGroupScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductGroupScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductPackageScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductPackageScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import cn.hutool.json.JSONArray;
 import cn.hutool.json.JSONUtil;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductRelationScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductRelationScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductReplyScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductReplyScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import cn.hutool.core.date.DateTime;
 import com.fs.common.annotation.Log;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductRuleScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductRuleScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import cn.hutool.json.JSONUtil;
 import com.fs.common.annotation.Log;

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
@@ -60,6 +60,7 @@ public class FsStoreProductScrmController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('store:storeProduct:list')")
     @PostMapping("/batchModify")
+    @Log(title = "商品管理", businessType = BusinessType.UPDATE,isStoreLog = true,logParam = {"商品","批量修改商品信息"})
     public R batchModify(@RequestBody ModifyMoreDTO modifyMoreDTO){
         fsStoreProductService.batchModify(modifyMoreDTO);
         return R.ok();
@@ -86,7 +87,7 @@ public class FsStoreProductScrmController extends BaseController
      * 导出商品列表
      */
     @PreAuthorize("@ss.hasPermi('store:storeProduct:export')")
-    @Log(title = "商品", businessType = BusinessType.EXPORT)
+    @Log(title = "商品管理", businessType = BusinessType.EXPORT, isStoreLog = true,logParam = {"商品","导出商品信息"})
     @GetMapping("/export")
     public AjaxResult export(FsStoreProductScrm fsStoreProduct)
     {
@@ -96,7 +97,7 @@ public class FsStoreProductScrmController extends BaseController
     }
 
 
-    @Log(title = "商品导入", businessType = BusinessType.IMPORT)
+    @Log(title = "商品管理", businessType = BusinessType.IMPORT,isStoreLog = true,logParam = {"商品","商品导入"})
     @PreAuthorize("@ss.hasPermi('store:storeProduct:import')")
     @PostMapping("/importData")
     public AjaxResult importData(MultipartFile file, boolean updateSupport) throws Exception
@@ -128,7 +129,8 @@ public class FsStoreProductScrmController extends BaseController
     }
 
     @PreAuthorize("@ss.hasPermi('store:storeProduct:add')")
-    @Log(title = "商品", businessType = BusinessType.INSERT)
+    @Log(title = "商品管理", businessType = BusinessType.INSERT, businessTypeExpression = "#p0.getProductId()>0? T(com.fs.common.enums.BusinessType).UPDATE: T(com.fs.common.enums.BusinessType).INSERT"
+            , isStoreLog = true, logParamExpression = "#p0.getProductId()>0? new String[]{'商品','修改商品'}: new String[]{'商品','新增商品'}")
     @PostMapping(value = "/addOrEdit")
     public R addOrEdit(@RequestBody FsStoreProductAddEditParam fsStoreProduct)
     {
@@ -149,7 +151,8 @@ public class FsStoreProductScrmController extends BaseController
      * 删除商品
      */
     @PreAuthorize("@ss.hasPermi('store:storeProduct:remove')")
-    @Log(title = "商品", businessType = BusinessType.DELETE)
+    @Log(title = "商品管理", businessType = BusinessType.DELETE,isStoreLog = true,
+            logParamExpression ="#p0.length>1?new String[]{'商品','批量删除商品信息'}: new String[]{'商品','删除商品信息'}" )
 	@DeleteMapping("/{productIds}")
     public AjaxResult remove(@PathVariable Long[] productIds)
     {

fs-admin/src/main/java/com/fs/hisStore/FsStoreProductTemplateScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreProductTemplateScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreScrmController.java

@@ -0,0 +1,134 @@
+package com.fs.hisStore.controller;
+
+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.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.ParseUtils;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.hisStore.domain.FsStoreScrm;
+import com.fs.his.param.FsStoreAuditParam;
+import com.fs.hisStore.service.IFsStoreScrmService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 店铺管理Controller
+ *
+ * @author fs
+ * @date 2023-06-15
+ */
+@RestController
+@RequestMapping("/store/his/store")
+public class FsStoreScrmController extends BaseController
+{
+    @Autowired
+    private IFsStoreScrmService fsStoreService;
+
+    /**
+     * 查询店铺管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(FsStoreScrm fsStore)
+    {
+        startPage();
+        List<FsStoreScrm> list = fsStoreService.selectFsStoreList(fsStore);
+        for (FsStoreScrm store : list) {
+            store.setPhone(ParseUtils.parsePhone(store.getPhone()));
+        }
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出店铺管理列表
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:export')")
+    @Log(title = "店铺管理", businessType = BusinessType.EXPORT,logParam = {"店铺","导出店铺信息"},isStoreLog = true)
+    @GetMapping("/export")
+    public AjaxResult export(FsStoreScrm fsStore)
+    {
+        List<FsStoreScrm> list = fsStoreService.selectFsStoreList(fsStore);
+        for (FsStoreScrm store : list) {
+            store.setPhone(ParseUtils.parsePhone(store.getPhone()));
+        }
+        ExcelUtil<FsStoreScrm> util = new ExcelUtil<FsStoreScrm>(FsStoreScrm.class);
+        return util.exportExcel(list, "店铺管理数据");
+    }
+
+    /**
+     * 获取店铺管理详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:query')")
+    @GetMapping(value = "/{storeId}")
+    public AjaxResult getInfo(@PathVariable("storeId") Long storeId)
+    {
+        FsStoreScrm fsStore = fsStoreService.selectFsStoreByStoreId(storeId);
+        fsStore.setPhone(ParseUtils.parsePhone(fsStore.getPhone()));
+        return AjaxResult.success(fsStore);
+    }
+
+    /**
+     * 新增店铺管理
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:add')")
+    @Log(title = "店铺管理", businessType = BusinessType.INSERT,logParam = {"店铺","新增店铺信息"},isStoreLog = true)
+    @PostMapping
+    public AjaxResult add(@RequestBody FsStoreScrm fsStore)
+    {
+        return toAjax(fsStoreService.insertFsStore(fsStore));
+    }
+
+    /**
+     * 修改店铺管理
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:edit')")
+    @Log(title = "店铺管理", businessType = BusinessType.UPDATE,logParam = {"店铺","修改店铺信息"},isStoreLog = true)
+    @PutMapping
+    public AjaxResult edit(@RequestBody FsStoreScrm fsStore)
+    {
+
+        if (fsStore.getPhone()!=null&&fsStore.getPhone().contains("*")){
+            fsStore.setPhone(null);
+        }
+        return toAjax(fsStoreService.updateFsStore(fsStore));
+    }
+
+    /**
+     * 删除店铺管理
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:remove')")
+    @Log(title = "店铺管理", businessType = BusinessType.DELETE,logParam = {"店铺","删除店铺信息"},isStoreLog = true)
+	@DeleteMapping("/{storeIds}")
+    public AjaxResult remove(@PathVariable Long[] storeIds)
+    {
+        return toAjax(fsStoreService.deleteFsStoreByStoreIds(storeIds));
+    }
+
+    /**
+     * 店铺审核
+     */
+    @PreAuthorize("@ss.hasPermi('his:store:audit')")
+    @Log(title = "店铺审核", businessType = BusinessType.UPDATE,logParam = {"店铺","店铺审核"},isStoreLog = true)
+    @PutMapping("/audit")
+    public AjaxResult audit(@RequestBody FsStoreAuditParam fsStore)
+    {
+        return toAjax(fsStoreService.updateFsStoreAudit(fsStore));
+    }
+
+    /**
+     * 重置店铺密码
+     * */
+    @PreAuthorize("@ss.hasPermi('his:store:refresh')")
+    @Log(title = "店铺管理", businessType = BusinessType.UPDATE,logParam = {"店铺","重置店铺密码"},isStoreLog = true)
+    @PutMapping("/refresh/{storeId}")
+    public AjaxResult refresh(Long storeId)
+    {
+        return toAjax(fsStoreService.refreshFsStore(storeId));
+    }
+
+}

fs-admin/src/main/java/com/fs/hisStore/FsStoreShopScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreShopScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreShopStaffScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreShopStaffScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreStatisticsScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreStatisticsScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/FsStoreVisitScrmController.java → fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreVisitScrmController.java

@@ -1,4 +1,4 @@
-package com.fs.hisStore;
+package com.fs.hisStore.controller;
 
 import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;

fs-admin/src/main/java/com/fs/hisStore/controller/SysOperlogScrmController.java

@@ -0,0 +1,50 @@
+package com.fs.hisStore.controller;
+
+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.page.TableDataInfo;
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.poi.ExcelUtil;
+import com.fs.hisStore.service.ISysOperLogScrmService;
+import com.fs.hisStore.domain.SysOperLogScrm;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 操作日志记录
+ *
+
+ */
+@RestController
+@RequestMapping("/store/operlogScrm")
+public class SysOperlogScrmController extends BaseController
+{
+    private final ISysOperLogScrmService operLogService;
+
+    public SysOperlogScrmController(ISysOperLogScrmService operLogService) {
+        this.operLogService = operLogService;
+    }
+
+    @PreAuthorize("@ss.hasPermi('his:storeLog:export')")
+    @GetMapping("/list")
+    public TableDataInfo list(SysOperLogScrm operLog)
+    {
+        startPage();
+        List<SysOperLogScrm> list = operLogService.selectOperLogList(operLog);
+        return getDataTable(list);
+    }
+
+    @Log(title = "操作日志", businessType = BusinessType.EXPORT)
+    @PreAuthorize("@ss.hasPermi('his:storeLog:export')")
+    @GetMapping("/export")
+    public AjaxResult export(SysOperLogScrm operLog)
+    {
+        List<SysOperLogScrm> list = operLogService.selectOperLogList(operLog);
+        ExcelUtil<SysOperLogScrm> util = new ExcelUtil<>(SysOperLogScrm.class);
+        return util.exportExcel(list, "操作日志");
+    }
+
+}

fs-service/src/main/java/com/fs/task/CrmTask.java → fs-admin/src/main/java/com/fs/hisStore/task/CrmTask.java

@@ -1,4 +1,4 @@
-package com.fs.task;
+package com.fs.hisStore.task;
 
 import com.fs.crm.service.ICrmCustomerService;
 import lombok.extern.slf4j.Slf4j;

fs-service/src/main/java/com/fs/task/ErpTask.java → fs-admin/src/main/java/com/fs/hisStore/task/ErpTask.java

@@ -1,4 +1,4 @@
-package com.fs.task;
+package com.fs.hisStore.task;
 
 import com.fs.erp.domain.ErpOrder;
 import com.fs.erp.domain.FsErpFinishPush;

fs-service/src/main/java/com/fs/task/StoreTask.java → fs-admin/src/main/java/com/fs/hisStore/task/MallStoreTask.java

@@ -1,4 +1,4 @@
-package com.fs.task;
+package com.fs.hisStore.task;
 
 
 import cn.hutool.core.util.StrUtil;
@@ -21,8 +21,8 @@ import com.fs.his.dto.ExpressInfoDTO;
 import com.fs.his.service.IFsExpressService;
 import com.fs.his.service.IFsUserService;
 import com.fs.his.utils.ConfigUtil;
-import com.fs.hisStore.config.FsErpConfig;
 import com.fs.hisStore.domain.*;
+import com.fs.hisStore.dto.DateComparisonConfigDTO;
 import com.fs.hisStore.enums.ShipperCodeEnum;
 import com.fs.hisStore.mapper.FsStoreOrderItemScrmMapper;
 import com.fs.hisStore.mapper.FsStoreOrderScrmMapper;
@@ -35,16 +35,20 @@ import com.fs.pay.service.IPayService;
 import com.fs.store.config.StoreConfig;
 import com.fs.system.service.ISysConfigService;
 import com.fs.ybPay.domain.OrderResult;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.text.ParseException;
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 import static com.fs.hisStore.constants.StoreConstants.DELIVERY;
 
@@ -53,8 +57,9 @@ import static com.fs.hisStore.constants.StoreConstants.DELIVERY;
  *
  * @author fs
  */
+@Slf4j
 @Component("mallStoreTask")
-public class StoreTask
+public class MallStoreTask
 {
     @Autowired
     private RedisTemplate redisTemplate;
@@ -68,8 +73,6 @@ public class StoreTask
     private IFsStoreAfterSalesScrmService afterSalesService;
     @Autowired
     private IFsUserService userService;
-
-
     @Autowired
     private IPayService ybPayService;
     @Autowired
@@ -128,6 +131,10 @@ public class StoreTask
     @Qualifier("JSTErpOrderServiceImpl")
     private IErpOrderService jSTOrderService;
 
+    @Autowired
+    @Qualifier("k9OrderScrmServiceImpl")
+    private IErpOrderService k9OrderService;
+
     @Autowired
     private ConfigUtil configUtil;
 
@@ -473,6 +480,8 @@ public class StoreTask
                     erpOrderService = dfOrderService;
                 } else if (erpType == 5) {
                     erpOrderService = jSTOrderService;
+                }else if (erpType == 6) {
+                    erpOrderService = k9OrderService;
                 }
             }
         }
@@ -504,4 +513,82 @@ public class StoreTask
         fsUserOnlineStateService.insertUserNotOnline();
     }*/
 
+    /**
+     * 提醒证件到期任务
+     * */
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+    public void remindCertValidation() {
+        log.info("提醒店铺证件到期任务执行... 当前时间: {}", LocalTime.now());
+
+        // 从配置表获取需要比较的表和字段
+        List<DateComparisonConfigDTO> tablesToCheck = jdbcTemplate.query(
+                "SELECT table_name, date_column,in_advance,user_column,phone_column,remind_words,platform,cert_type" +
+                        " FROM date_comparison_config",(rs, rowNum)->{
+                    return DateComparisonConfigDTO.builder()
+                            .tableName(rs.getString("table_name"))//表名
+                            .certType(rs.getString("cert_type"))//证件类型
+                            .dateColumn(rs.getString("date_column"))//日期字段
+                            .userColumn(rs.getString("user_column"))//用户字段
+                            .remindWords(rs.getString("remindWords"))//提醒内容
+                            .phoneColumn(rs.getString("phone_column"))//提醒手机
+                            .inAdvance(rs.getInt("inAdvance"))//提前天数
+                            .platform(rs.getString("platform")).build();//平台
+                });
+
+        tablesToCheck.forEach(dto -> {
+            //获取证件失效日期字段小于当前时间加提前天数的用户和电话号码
+            String sql = String.format("SELECT %s , %s " +
+                            "FROM %s " +
+                            "WHERE %s >= DATE_SUB(CURDATE(), INTERVAL %d DAY)",
+                            dto.getUserColumn(),
+                            dto.getPhoneColumn(),
+                            dto.getTableName(),
+                            dto.getDateColumn(),
+                            dto.getInAdvance()
+                            );
+            List<Map<String, Object>> users = jdbcTemplate.queryForList(sql);
+            users.forEach(user -> {
+                String userName = (String) user.get(dto.getUserColumn());
+                String phone = (String) user.get(dto.getPhoneColumn());
+                String remindWords = String.format("【%s平台提示】尊敬的%s用户，店铺%s证件即将到期，请及时处理！",
+                        dto.getPlatform(),
+                        userName,
+                        dto.getCertType());
+                // 使用phone发送remindWords短信
+                // TODO 发送通知
+            });
+        });
+
+    }
+
+    /**
+     * 禁用店铺
+     * */
+    public void disable() {
+        log.info("禁用店铺任务执行... 当前时间: {}", LocalTime.now());
+        // 从配置表获取需要禁用的表和字段
+        List<DateComparisonConfigDTO> toDisable = jdbcTemplate.query(
+                "SELECT table_name, date_column,invalid_expression,status_column" +
+                        " FROM date_comparison_config " +
+                        " WHERE is_do_invalid = '1'",(rs, rowNum)-> DateComparisonConfigDTO.builder()
+                                .tableName(rs.getString("table_name"))//表名
+                                .dateColumn(rs.getString("date_column"))//日期字段
+                                .invalidExpression(rs.getString("invalid_expression"))//失效表达式
+                                .statusColumn(rs.getString("status_column"))//状态字段
+                                .build());
+
+        toDisable.forEach(dto -> {
+            //更新证件失效日期字段小于当前时间的数据
+            String sql = String.format("UPDATE %s " +
+                    "SET %s = %s " +
+                    "WHERE %s < CURDATE()",
+                    dto.getTableName(),
+                    dto.getStatusColumn(),
+                    dto.getInvalidExpression(),
+                    dto.getDateColumn());
+            jdbcTemplate.update(sql);
+        });
+    }
+
 }

fs-service/src/main/java/com/fs/task/stats/FsStatsMemberDailyTask.java → fs-admin/src/main/java/com/fs/hisStore/task/stats/FsStatsMemberDailyTask.java

@@ -1,4 +1,4 @@
-package com.fs.task.stats;
+package com.fs.hisStore.task.stats;
 
 import com.fs.statis.service.IFsStatsMemberDailyService;
 import lombok.extern.slf4j.Slf4j;

fs-common/src/main/java/com/fs/common/annotation/Log.java

@@ -7,10 +7,11 @@ import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.enums.OperatorType;
+import com.fs.common.utils.StringUtils;
 
 /**
  * 自定义操作日志记录注解
- * 
+ *
 
  *
  */
@@ -20,7 +21,7 @@ import com.fs.common.enums.OperatorType;
 public @interface Log
 {
     /**
-     * 模块 
+     * 模块
      */
     public String title() default "";
 
@@ -38,4 +39,18 @@ public @interface Log
      * 是否保存请求的参数
      */
     public boolean isSaveRequestData() default true;
+
+    /**
+     * 是否商城日志
+     */
+    public boolean isStoreLog() default false;
+
+    /**
+     * 商城日志传参
+     * */
+    public String[] logParam() default {};
+
+    String businessTypeExpression() default "";
+
+    String logParamExpression() default "";
 }

fs-common/src/main/java/com/fs/common/core/redis/RedisCache.java

@@ -233,4 +233,7 @@ public class RedisCache
     }
 
 
+    public Boolean setIfAbsent(String key, String value, long timeout, TimeUnit unit) {
+        return redisTemplate.opsForValue().setIfAbsent(key, value, timeout, unit);
+    }
 }

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

@@ -216,7 +216,7 @@ public class UserController extends AppBaseController {
             result.put("perms", perms);
             return R.ok("登录成功").put("data", result);
         } catch (Exception e) {
-            return R.error("登录异常");
+            return R.error("登录异常:"+e.getMessage());
         }
     }
 

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

@@ -37,6 +37,7 @@ 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 org.springframework.web.multipart.MultipartFile;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -427,5 +428,10 @@ public class CompanyUserController extends BaseController
             return AjaxResult.error("操作失败");
         }
     }
-
+    @PostMapping("/common/uploadOSS")
+    public R uploadOSS(@RequestParam("file") MultipartFile file,
+                       @RequestParam("userId") String userId) throws Exception {
+        String url = companyUserService.uploadQrCode(file, userId);
+        return R.ok().put("url", url);
+    }
 }

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

@@ -220,10 +220,11 @@ public class FsUserCoursePeriodController extends BaseController {
         FsUserCoursePeriod period = fsUserCoursePeriodService.selectFsUserCoursePeriodById(param.getPeriodId());
         param.setMaxDate(LocalDate.now().plusDays(period.getMaxViewNum()));
         List<FsPeriodCountVO> list = fsUserCoursePeriodDaysService.periodCourseCount(param);
+        long count = fsUserCoursePeriodDaysService.periodCourseByCount(param);
         PageInfo<FsPeriodCountVO> pageInfo = new PageInfo<>(list);
         Map<String, Object> result = new HashMap<>();
         result.put("rows", pageInfo.getList());
-        result.put("total", pageInfo.getTotal());
+        result.put("total", count);
         return R.ok(result);
     }
 

fs-company/src/main/java/com/fs/company/controller/qw/SopUserLogsInfoController.java

@@ -418,6 +418,18 @@ public class SopUserLogsInfoController extends BaseController
         return sopUserLogsInfoService.sendUserLogsInfoMsgType(param);
     }
 
+    /**
+     * 一键群发sopUserLogsInfo
+     */
+    @PreAuthorize("@ss.hasPermi('qw:sopUserLogsInfo:msg')")
+    @Log(title = "sendUserLogsInfoMsgSop", businessType = BusinessType.INSERT,isSaveRequestData=false)
+    @PostMapping("/sendUserLogsInfoMsgSop")
+    @RepeatSubmit
+    public R sendUserLogsInfoMsgSop(@RequestBody SendUserLogsInfoMsgParam param)
+    {
+        return sopUserLogsInfoService.sendUserLogsInfoMsgSop(param);
+    }
+
 
     /**
      * 删除sopUserLogsInfo

fs-company/src/main/java/com/fs/company/controller/store/FsStoreOrderController.java

@@ -539,10 +539,19 @@ public class FsStoreOrderController extends BaseController
     @Qualifier("wdtErpOrderServiceImpl")
     private IErpOrderService wdtOrderService;
 
+    @Autowired
+    @Qualifier("hzOMSErpOrderServiceImpl")
+    private IErpOrderService hzOMSErpOrderService;
+    @Autowired
+    @Qualifier("dfOrderServiceImpl")
+    private IErpOrderService dfOrderService;
+
     @Autowired
     @Qualifier("JSTErpOrderServiceImpl")
     private IErpOrderService jSTOrderService;
-
+    @Autowired
+    @Qualifier("k9OrderScrmServiceImpl")
+    private IErpOrderService k9OrderService;
     private IErpOrderService getErpService() {
         FsSysConfig sysConfig = configUtil.getSysConfig();
         Integer erpOpen = sysConfig.getErpOpen();
@@ -557,8 +566,16 @@ public class FsStoreOrderController extends BaseController
                 } else if (erpType == 2){
                     //旺店通
                     erpOrderService =  wdtOrderService;
+                } else if (erpType == 3){
+                    //
+                    erpOrderService =  hzOMSErpOrderService;
+                } else if (erpType == 4){
+                    //代服
+                    erpOrderService =  dfOrderService;
                 }else if(erpType == 5){
-                    erpOrderService = jSTOrderService;
+                    erpOrderService=jSTOrderService;
+                }else if(erpType == 6){
+                    erpOrderService=k9OrderService;
                 }
                 return erpOrderService;
 

fs-company/src/main/java/com/fs/company/controller/store/FsUserAddressController.java

@@ -1,9 +1,11 @@
 package com.fs.company.controller.store;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSON;
 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.domain.model.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
@@ -73,7 +75,13 @@ public class FsUserAddressController extends BaseController
         ExcelUtil<FsUserAddress> util = new ExcelUtil<FsUserAddress>(FsUserAddress.class);
         return util.exportExcel(list, "用户地址数据");
     }
-
+    @GetMapping("/getAddressList")
+    public R getAddressList(FsUserAddress fsUserAddress)
+    {
+        fsUserAddress.setIsDel(0);
+        List<FsUserAddress> list = fsUserAddressService.selectFsUserAddressList(fsUserAddress);
+        return R.ok().put("data", list);
+    }
     /**
      * 获取用户地址详细信息
      */
@@ -100,7 +108,7 @@ public class FsUserAddressController extends BaseController
     @PostMapping
     public AjaxResult add(@RequestBody FsUserAddress fsUserAddress)
     {
-        if(fsUserAddress.getIsDefault()==1){
+        if(ObjectUtil.isNotEmpty(fsUserAddress.getIsDefault())&&fsUserAddress.getIsDefault()==1){
             //处理默认地址
             fsUserAddressService.clearIsDefalut(fsUserAddress.getUserId());
         }

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

@@ -77,6 +77,13 @@ public class FsUserController extends BaseController
         }
         return getDataTable(list);
     }
+    @GetMapping("/getUserList")
+    public R getUserList( FsUser fsUser)
+    {
+        fsUser.setIsDel(0);
+        List<FsUser> list=fsUserService.selectFsUserList(fsUser);
+        return R.ok().put("data", list);
+    }
 
     @PreAuthorize("@ss.hasPermi('his:user:list')")
     @GetMapping("/userList")

fs-company/src/main/java/com/fs/company/controller/store/FsUserCouponController.java

@@ -105,11 +105,9 @@ public class FsUserCouponController extends BaseController
     @PostMapping("/sendCoupon")
     public AjaxResult sendCoupon(@RequestBody FsUserCouponSendParam fsUserCoupon)
     {
-        if (fsUserCoupon.getSetSendUserId() == null){
-            LoginUser loginUser = SecurityUtils.getLoginUser();
-            Long userId = loginUser.getUser().getUserId();
-            fsUserCoupon.setSetSendUserId(userId);
-        }
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        fsUserCoupon.setCompanyId(loginUser.getCompany().getCompanyId());
+        fsUserCoupon.setCompanyUserId(loginUser.getUser().getUserId());
         return toAjax(fsUserCouponService.sendFsUserCoupon(fsUserCoupon));
     }
 

fs-company/src/main/java/com/fs/framework/config/SecurityConfig.java

@@ -119,6 +119,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 .antMatchers("/msg").anonymous()
                 .antMatchers("/common/getId**").anonymous()
                 .antMatchers("/common/uploadOSS**").anonymous()
+                .antMatchers("/company/user/common/uploadOSS").anonymous()
                 .antMatchers("/pay/wxPay/payNotify**").anonymous()
                 .antMatchers("/common/uploadWang**").anonymous()
                 .antMatchers("/common/download**").anonymous()

fs-company/src/main/java/com/fs/hisStore/controller/FsCityScrmController.java

@@ -1,59 +0,0 @@
-package com.fs.hisStore.controller;
-
-import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.domain.R;
-import com.fs.hisStore.domain.FsCityScrm;
-import com.fs.hisStore.service.IFsCityScrmService;
-import com.fs.store.utils.CityTreeUtil;
-import com.fs.store.vo.CityVO;
-import com.google.common.collect.Lists;
-import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.Cacheable;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-
-/**
- * 城市Controller
- *
- * @author fs
- * @date 2022-03-15
- */
-@RestController
-@RequestMapping("/store/store/city")
-public class FsCityScrmController extends BaseController
-{
-    @Autowired
-    private IFsCityScrmService fsCityService;
-
-//
-//    @GetMapping("/getAllList")
-//    @Cacheable("citys")
-//    public R getAllList(FsCityScrm fsCity)
-//    {
-//        List<FsCityScrm> list = fsCityService.selectFsCityList(fsCity);
-//        return R.ok().put("data",list);
-//    }
-
-
-    @ApiOperation("获取城市数据")
-    @GetMapping("/getCitys")
-    @Cacheable("citys")
-    public R getCitys(HttpServletRequest request){
-        List<FsCityScrm> list=fsCityService.selectFsCitys();
-        List<CityVO> cityVOS = Lists.newArrayList();
-        for (FsCityScrm city : list){
-            CityVO cityVO = new CityVO();
-            cityVO.setValue(Long.parseLong(city.getCityId()));
-            cityVO.setLabel(city.getCityName());
-            cityVO.setPid(Long.parseLong(city.getParentId()));
-            cityVOS.add(cityVO);
-        }
-        return R.ok().put("data", CityTreeUtil.list2TreeConverter(cityVOS, 0));
-
-    }
-}

fs-framework/src/main/java/com/fs/framework/aspectj/LogAspect.java

@@ -6,15 +6,22 @@ import java.util.Iterator;
 import java.util.Map;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import com.fs.common.enums.BusinessType;
+import com.fs.common.utils.bean.BeanUtils;
+import com.fs.framework.web.domain.server.Sys;
+import com.fs.hisStore.domain.SysOperLogScrm;
 import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
 import org.aspectj.lang.Signature;
-import org.aspectj.lang.annotation.AfterReturning;
-import org.aspectj.lang.annotation.AfterThrowing;
-import org.aspectj.lang.annotation.Aspect;
-import org.aspectj.lang.annotation.Pointcut;
+import org.aspectj.lang.annotation.*;
 import org.aspectj.lang.reflect.MethodSignature;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.expression.EvaluationContext;
+import org.springframework.expression.ExpressionParser;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
 import org.springframework.stereotype.Component;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.multipart.MultipartFile;
@@ -34,7 +41,7 @@ import com.fs.system.domain.SysOperLog;
 
 /**
  * 操作日志记录处理
- * 
+ *
 
  */
 @Aspect
@@ -62,7 +69,7 @@ public class LogAspect
 
     /**
      * 拦截异常操作
-     * 
+     *
      * @param joinPoint 切点
      * @param e 异常
      */
@@ -116,6 +123,12 @@ public class LogAspect
             getControllerMethodDescription(joinPoint, controllerLog, operLog);
             // 保存数据库
             AsyncManager.me().execute(AsyncFactory.recordOper(operLog));
+            if(controllerLog.isStoreLog()){
+                SysOperLogScrm operLogScrm = new SysOperLogScrm();
+                BeanUtils.copyProperties(operLog, operLogScrm);
+                resolveParam((ProceedingJoinPoint)joinPoint,operLogScrm);
+                AsyncManager.me().execute(AsyncFactory.recordOperScrm(operLogScrm));
+            }
         }
         catch (Exception exp)
         {
@@ -123,12 +136,14 @@ public class LogAspect
             log.error("==前置通知异常==");
             log.error("异常信息:{}", exp.getMessage());
             exp.printStackTrace();
+        } catch (Throwable ex) {
+            throw new RuntimeException(ex);
         }
     }
 
     /**
      * 获取注解中对方法的描述信息 用于Controller层注解
-     * 
+     *
      * @param log 日志
      * @param operLog 操作日志
      * @throws Exception
@@ -151,7 +166,7 @@ public class LogAspect
 
     /**
      * 获取请求的参数，放到log中
-     * 
+     *
      * @param operLog 操作日志
      * @throws Exception 异常
      */
@@ -208,7 +223,7 @@ public class LogAspect
 
     /**
      * 判断是否需要过滤的对象。
-     * 
+     *
      * @param o 对象信息。
      * @return 如果是需要过滤的对象，则返回true；否则返回false。
      */
@@ -240,4 +255,49 @@ public class LogAspect
         return o instanceof MultipartFile || o instanceof HttpServletRequest || o instanceof HttpServletResponse
                 || o instanceof BindingResult;
     }
+
+    private final ExpressionParser parser = new SpelExpressionParser();
+
+    public void resolveParam(ProceedingJoinPoint joinPoint, SysOperLogScrm operLog) throws Throwable {
+        // 1. 获取注解实例
+        Method method = ((MethodSignature) joinPoint.getSignature()).getMethod();
+        Log annotation = method.getAnnotation(Log.class);
+
+        // 2. 准备简单上下文
+        StandardEvaluationContext context = new StandardEvaluationContext();
+        Object[] args = joinPoint.getArgs();
+        String[] paramNames = ((MethodSignature) joinPoint.getSignature()).getParameterNames();
+
+        // 设置参数名称和值到上下文
+        for (int i = 0; i < args.length; i++) {
+            context.setVariable("p" + i, args[i]); // 支持 #p0,#p1...
+            if (paramNames != null && i < paramNames.length) {
+                context.setVariable(paramNames[i], args[i]); // 支持参数名引用
+            }
+        }
+
+        // 3. 处理动态 businessType
+        BusinessType businessType = annotation.businessType();
+        if (!annotation.businessTypeExpression().isEmpty()) {
+            try {
+                businessType = parser.parseExpression(annotation.businessTypeExpression())
+                        .getValue(context, BusinessType.class);
+            } catch (Exception e) {
+                log.warn("解析 businessType 表达式失败，使用默认值: {}", e.getMessage());
+            }
+        }
+        // 4. 处理动态 logParam
+        String[] logParam = annotation.logParam();
+        if (!annotation.logParamExpression().isEmpty()) {
+            try {
+                logParam = parser.parseExpression(annotation.logParamExpression())
+                        .getValue(context, String[].class);
+            }catch (Exception e){
+                log.warn("解析 logParam 表达式失败，使用默认值: {}", e.getMessage());
+            }
+        }
+        operLog.setBusinessType(businessType.ordinal());
+        operLog.setMainType(logParam[0]);
+        operLog.setDes(logParam[1]);
+    }
 }

fs-framework/src/main/java/com/fs/framework/manager/factory/AsyncFactory.java

@@ -1,6 +1,9 @@
 package com.fs.framework.manager.factory;
 
 import java.util.TimerTask;
+
+import com.fs.hisStore.domain.SysOperLogScrm;
+import com.fs.hisStore.service.ISysOperLogScrmService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import com.fs.common.constant.Constants;
@@ -18,7 +21,7 @@ import eu.bitwalker.useragentutils.UserAgent;
 
 /**
  * 异步工厂（产生任务用）
- * 
+ *
 
  */
 public class AsyncFactory
@@ -27,7 +30,7 @@ public class AsyncFactory
 
     /**
      * 记录登录信息
-     * 
+     *
      * @param username 用户名
      * @param status 状态
      * @param message 消息
@@ -82,7 +85,7 @@ public class AsyncFactory
 
     /**
      * 操作日志记录
-     * 
+     *
      * @param operLog 操作日志信息
      * @return 任务task
      */
@@ -99,4 +102,24 @@ public class AsyncFactory
             }
         };
     }
+
+    /**
+     * 操作日志记录
+     *
+     * @param operLog 操作日志信息
+     * @return 任务task
+     */
+    public static TimerTask recordOperScrm(final SysOperLogScrm operLog)
+    {
+        return new TimerTask()
+        {
+            @Override
+            public void run()
+            {
+                // 远程查询操作地点
+                operLog.setOperLocation(AddressUtils.getRealAddressByIP(operLog.getOperIp()));
+                SpringUtils.getBean(ISysOperLogScrmService.class).insertOperlog(operLog);
+            }
+        };
+    }
 }

fs-qw-task/src/main/java/com/fs/app/taskService/impl/SopLogsTaskServiceImpl.java

@@ -12,6 +12,7 @@ import com.fs.company.domain.CompanyMiniapp;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.service.ICompanyMiniappService;
 import com.fs.company.service.ICompanyUserService;
+import com.fs.config.cloud.CloudHostProper;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.*;
 import com.fs.course.mapper.*;
@@ -136,6 +137,8 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
     private IQwSopTempContentService qwSopTempContentService;
     @Autowired
     private IQwSopTempVoiceService qwSopTempVoiceService;
+    @Autowired
+    private CloudHostProper cloudHostProper;
 
     // Blocking queues with bounded capacity to implement backpressure
     private final BlockingQueue<QwSopLogs> qwSopLogsQueue = new LinkedBlockingQueue<>(20000);
@@ -1261,6 +1264,7 @@ public class SopLogsTaskServiceImpl implements SopLogsTaskService {
         link.setCorpId(logVo.getCorpId());
         link.setCourseId(courseId.longValue());
         link.setQwExternalId(Long.parseLong(externalId));
+        link.setProjectCode(cloudHostProper.getProjectCode());
 
         if (StringUtil.strIsNullOrEmpty(isOfficial)){
             link.setLinkType(3);

fs-redis/src/main/java/com/fs/framework/config/MyBatisConfig.java

@@ -1,5 +1,6 @@
 package com.fs.framework.config;
 
+import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
 import com.fs.common.utils.StringUtils;
 import org.apache.ibatis.io.VFS;
 import org.apache.ibatis.session.SqlSessionFactory;
@@ -117,16 +118,16 @@ public class MyBatisConfig
     @Bean
     public SqlSessionFactory sqlSessionFactory(DataSource dataSource) throws Exception
     {
-        String typeAliasesPackage = env.getProperty("mybatis.typeAliasesPackage");
-        String mapperLocations = env.getProperty("mybatis.mapperLocations");
-        String configLocation = env.getProperty("mybatis.configLocation");
+        String typeAliasesPackage = env.getProperty("mybatis-plus.typeAliasesPackage");
+        String mapperLocations = env.getProperty("mybatis-plus.mapperLocations");
+        String configLocation = env.getProperty("mybatis-plus.configLocation");
         typeAliasesPackage = setTypeAliasesPackage(typeAliasesPackage);
         VFS.addImplClass(SpringBootVFS.class);
 
-        final SqlSessionFactoryBean sessionFactory = new SqlSessionFactoryBean();
+        final MybatisSqlSessionFactoryBean sessionFactory = new MybatisSqlSessionFactoryBean();
         sessionFactory.setDataSource(dataSource);
         sessionFactory.setTypeAliasesPackage(typeAliasesPackage);
-        sessionFactory.setMapperLocations(resolveMapperLocations(StringUtils.split(mapperLocations, ",")));
+        sessionFactory.setMapperLocations(new PathMatchingResourcePatternResolver().getResources(mapperLocations));
         sessionFactory.setConfigLocation(new DefaultResourceLoader().getResource(configLocation));
         return sessionFactory.getObject();
     }

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

@@ -121,6 +121,9 @@ public class Company extends BaseEntity
     @TableField(exist = false)
     private List<String> miniAppServer;
 
+    @TableField(exist = false)
+    private boolean updateMiniApp;
+
     /** 后台制单是否需要付款 默认1 0-否 1-是*/
     private Integer isPay;
 

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

@@ -310,4 +310,6 @@ public interface CompanyUserMapper
     List<QwIpadTotalVo> selectCompanyByIpadStatusCount();
 
     int insertQwIpadTotal(List<QwIpadTotalVo> qwIpadTotalVos);
+
+    void uploadQrCode(@Param("userId") String userId, @Param("url") String url);
 }

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

@@ -124,9 +124,15 @@ public interface ICompanyService
 
     void subtractCompanyMoney(FsStoreOrder order);
 
+    @Transactional
+    void subtractCompanyMoneyScrm(FsStoreOrderScrm order);
+
     void inquirySubtractCompanyMoney(FsInquiryOrder order);
     void refundCompanyMoney(FsStoreOrder order);
 
+    @Transactional
+    void refundCompanyMoneyScrm(FsStoreOrderScrm order);
+
     Company selectCompanyByIdForUpdate(Long companyId);
 
     public void subtractCompanyMoney(BigDecimal money, Long companyId);

fs-service/src/main/java/com/fs/company/service/ICompanyUserService.java

@@ -12,7 +12,9 @@ import com.fs.qw.vo.CompanyUserQwVO;
 import com.fs.qw.vo.QwOptionsVO;
 import com.fs.qw.vo.QwUserVO;
 import com.fs.wxUser.domain.CompanyWxUser;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -223,4 +225,5 @@ public interface ICompanyUserService {
 
     int insertQwIpadTotal(List<QwIpadTotalVo> qwIpadTotalVos);
 
+    String uploadQrCode(MultipartFile file,String userId) throws IOException;
 }

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

@@ -265,7 +265,9 @@ public class CompanyServiceImpl implements ICompanyService
     public int updateCompany(Company company)
     {
         company.setUpdateTime(DateUtils.getNowDate());
-        bindMiniApp(company);
+        if(company.isUpdateMiniApp()){
+            bindMiniApp(company);
+        }
         return companyMapper.updateCompany(company);
     }
     // 绑定小程序
@@ -681,6 +683,36 @@ public class CompanyServiceImpl implements ICompanyService
         }
     }
 
+    @Override
+    @Transactional
+    public void subtractCompanyMoneyScrm(FsStoreOrderScrm order) {
+
+        if(order.getCompanyId()!=null&&order.getCompanyId()>0){
+            Company company=companyMapper.selectCompanyByIdForUpdate(order.getCompanyId());
+            if(company!=null){
+                SysConfig sysConfig = sysConfigMapper.selectConfigByConfigKey("his.store");
+                StoreConfig fsPayConfig = new Gson().fromJson(sysConfig.getConfigValue(), StoreConfig.class);
+                Integer DeductMoneyRate = fsPayConfig.getDeductMoneyRate();
+                BigDecimal money = BigDecimal.ZERO;
+                if (DeductMoneyRate != null && DeductMoneyRate > 0) {
+                    money = order.getPrescribePrice().multiply(new BigDecimal(DeductMoneyRate).multiply(new BigDecimal("0.01")));
+                }
+                logger.info("扣除成本:"+order.getOrderCode()+":"+money);
+                company.setMoney(company.getMoney().subtract(money));
+                companyMapper.updateCompany(company);
+                CompanyMoneyLogs log=new CompanyMoneyLogs();
+                log.setCompanyId(company.getCompanyId());
+                log.setRemark("发货扣除成本");
+                log.setMoney(money.multiply(new BigDecimal(-1)));
+                log.setLogsType(5);
+                log.setBalance(company.getMoney());
+                log.setCreateTime(new Date());
+                log.setBusinessId(order.getId().toString());
+                moneyLogsMapper.insertCompanyMoneyLogs(log);
+            }
+        }
+    }
+
     @Override
     @Transactional
     public void inquirySubtractCompanyMoney(FsInquiryOrder order) {
@@ -1207,6 +1239,52 @@ public class CompanyServiceImpl implements ICompanyService
         }
     }
 
+    @Override
+    @Transactional
+    public void refundCompanyMoneyScrm(FsStoreOrderScrm order) {
+        if(order.getCompanyId()!=null&&order.getCompanyId()>0){
+            Company company=companyMapper.selectCompanyByIdForUpdate(order.getCompanyId());
+            if(company!=null){
+                List<CompanyMoneyLogs> companyMoneyLogs = moneyLogsMapper.selectCompanyMoneyByOrderId(order.getId());
+                for (CompanyMoneyLogs logs : companyMoneyLogs) {
+                    if (logs.getLogsType()==3){
+                        if (order.getTuiMoneyStatus()!=null&&order.getTuiMoneyStatus()==0){
+                            continue;
+                        }
+                        BigDecimal money = logs.getMoney().multiply(new BigDecimal(-1));
+                        logger.info("退款佣金扣除:"+company.getCompanyId()+":"+money);
+                        company.setMoney(company.getMoney().subtract(logs.getMoney()));
+                        companyMapper.updateCompany(company);
+                        CompanyMoneyLogs log=new CompanyMoneyLogs();
+                        log.setCompanyId(company.getCompanyId());
+                        log.setRemark("退款佣金扣除");
+                        log.setMoney(money);
+                        log.setLogsType(4);
+                        log.setBalance(company.getMoney());
+                        log.setCreateTime(new Date());
+                        log.setBusinessId(order.getId().toString());
+                        moneyLogsMapper.insertCompanyMoneyLogs(log);
+                    }else if(logs.getLogsType()==5){
+                        BigDecimal money = logs.getMoney().multiply(new BigDecimal(-1));
+                        logger.info("退款成本返还:"+company.getCompanyId()+":"+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(6);
+                        log.setBalance(company.getMoney());
+                        log.setCreateTime(new Date());
+                        log.setBusinessId(order.getId().toString());
+                        moneyLogsMapper.insertCompanyMoneyLogs(log);
+                    }
+                }
+
+            }
+        }
+    }
+
     @Override
     public Company selectCompanyByIdForUpdate(Long companyId) {
         return companyMapper.selectCompanyByIdForUpdate(companyId);

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

@@ -5,7 +5,9 @@ import com.alibaba.fastjson.JSON;
 import com.fs.common.annotation.DataScope;
 import com.fs.common.core.domain.R;
 import com.fs.common.core.redis.RedisCache;
+import com.fs.common.exception.CustomException;
 import com.fs.common.exception.ServiceException;
+import com.fs.common.exception.file.OssException;
 import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.StringUtils;
 import com.fs.company.domain.*;
@@ -24,6 +26,8 @@ import com.fs.qw.mapper.QwUserMapper;
 import com.fs.qw.vo.CompanyUserQwVO;
 import com.fs.qw.vo.QwOptionsVO;
 import com.fs.qw.vo.QwUserVO;
+import com.fs.system.oss.CloudStorageService;
+import com.fs.system.oss.OSSFactory;
 import com.fs.voice.utils.StringUtil;
 import com.fs.wxUser.domain.CompanyWxUser;
 import org.slf4j.Logger;
@@ -31,7 +35,9 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
@@ -249,10 +255,10 @@ public class CompanyUserServiceImpl implements ICompanyUserService
         logger.info("打印邀请用户信息------------------------------》：{}",user);
         // 新增用户信息
         int rows = companyUserMapper.insertCompanyUser(user);
-//        // 新增用户岗位关联
-//        insertUserPost(user);
-//        // 新增用户与角色管理
-//        insertUserRole(user);
+        // 新增用户岗位关联
+        insertUserPost(user);
+        // 新增用户与角色管理
+        insertUserRole(user);
         //新增用户需要修改密码
         redisCache.setCacheObject("newCompanyUser:" + user.getCompanyId() + ":" +user.getUserName(),user.getUserId());
         return rows;
@@ -636,5 +642,22 @@ public class CompanyUserServiceImpl implements ICompanyUserService
     public int insertQwIpadTotal(List<QwIpadTotalVo> qwIpadTotalVos) {
         return companyUserMapper.insertQwIpadTotal(qwIpadTotalVos);
     }
-
+    @Override
+    public String uploadQrCode(MultipartFile file, String userId) throws IOException {
+        if (file.isEmpty())
+        {
+            throw new OssException("上传文件不能为空");
+        }
+        // 上传文件
+        String fileName = file.getOriginalFilename();
+        String suffix = fileName.substring(fileName.lastIndexOf("."));
+        CloudStorageService storage = OSSFactory.build();
+        String url = storage.uploadSuffix(file.getBytes(), suffix);
+
+        if(userId == null) {
+            throw new CustomException("上传二维码失败！userId 为空！");
+        }
+        companyUserMapper.uploadQrCode(userId,url);
+        return url;
+    }
 }

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

@@ -12,4 +12,7 @@ public class CloudHostProper {
 
     @Value("${headerImg.imgUrl}")
     private String headerImg;
+
+    @Value("${cloud_host.projectCode}")
+    private String projectCode;
 }

fs-service/src/main/java/com/fs/course/config/CourseConfig.java

@@ -23,7 +23,7 @@ public class CourseConfig implements Serializable {
     private String registerDomainName;//注册域名
     private String courseDomainName;//链接域名
     private String miniprogramAppid;//链接域名
-    private Integer rewardType; // 奖励类型 1红包 2积分
+    private Integer rewardType; // 奖励类型 1红包 2积分 3红包+积分
     private Integer redPacketMode;//红包模式 1总公司 2销售公司
     private BigDecimal moneyPri;//充值手续费百分比
     private BigDecimal redPackageMoney;//充值手续费百分比
@@ -52,6 +52,12 @@ public class CourseConfig implements Serializable {
      */
     private String userCourseAuthDomain;
 
+    /**
+     * 会员看课
+     * 炮灰看课发红包-服务号发
+     */
+    private String userCourseH5Reward;
+
     /**
      * 是否绑定
      */

fs-service/src/main/java/com/fs/course/domain/FsCourseLink.java

@@ -66,4 +66,7 @@ public class FsCourseLink extends BaseEntity
     private String uNo;
 //    private String link_uuid;
 
+    @ApiModelProperty(value = "项目唯一标识(PS:MYHK)")
+    private String projectCode;
+
 }

fs-service/src/main/java/com/fs/course/domain/FsCourseRealLink.java

@@ -45,4 +45,7 @@ public class FsCourseRealLink implements Serializable
     private String chatId;
 
     private Long projectId;//项目ID
+
+    @ApiModelProperty(value = "项目唯一标识(PS:MYHK)")
+    private String projectCode;
 }

fs-service/src/main/java/com/fs/course/dto/FsOrderDeliveryNoteDTO.java

@@ -0,0 +1,22 @@
+package com.fs.course.dto;
+
+import com.fs.common.annotation.Excel;
+import lombok.Data;
+
+/**
+ * 订单发货下载模板
+ * **/
+@Data
+public class FsOrderDeliveryNoteDTO {
+    /**
+     * 系统订单号
+     * **/
+    @Excel(name = "系统订单号(必填)",width = 40,sort = 1)
+    private String orderNumber;
+
+    /**
+     * 发货状态
+     * **/
+    @Excel(name = "系统订单号(1：待发货、2：待收货、3：交易完成,-3：已取消)填写对应数字",width = 90,sort = 2)
+    private Integer deliveryNoteStatus;
+}

fs-service/src/main/java/com/fs/course/mapper/FsCourseWatchLogMapper.java

@@ -302,7 +302,7 @@ public interface FsCourseWatchLogMapper extends BaseMapper<FsCourseWatchLog> {
     @Select("select * from fs_course_watch_log " +
             "where video_id = #{videoId} " +
             "and company_user_id = #{companyUserId} " +
-            "and user_id = #{userId} and send_type = 1 ")
+            "and user_id = #{userId} and send_type = 1  order by create_time desc limit 1")
     FsCourseWatchLog getWatchCourseVideoByFsUser(@Param("userId") Long userId, @Param("videoId") Long videoId, @Param("companyUserId") Long companyUserId);
 
     FsCourseWatchLog getWatchLogByFsUser(@Param("videoId") Long videoId, @Param("fsUserId") Long fsUserId, @Param("companyUserId") Long companyUserId);

fs-service/src/main/java/com/fs/course/mapper/FsUserCoursePeriodDaysMapper.java

@@ -117,4 +117,5 @@ public interface FsUserCoursePeriodDaysMapper extends BaseMapper<FsUserCoursePer
             "</script>")
     int updateBatchDelFlag(@Param("ids") Long [] ids, @Param("delFlag") Integer delFlag);
 
+    Long selectFsUserCoursePeriodDaysCount(FsUserCoursePeriodDays fsUserCoursePeriodDays);
 }

fs-service/src/main/java/com/fs/course/param/FsCourseSendRewardUParam.java

@@ -27,7 +27,7 @@ public class FsCourseSendRewardUParam implements Serializable
     private Integer sendType;
     private Long periodId;
 
-    private String appId;
+    private String appId; //前端传来的小程序的appid
 
     private String code;
 

fs-service/src/main/java/com/fs/course/param/FsCourseTrafficLogParam.java

@@ -35,4 +35,9 @@ public class FsCourseTrafficLogParam {
      */
     private String tabType;
 
+    /**
+     * 公共看课
+     */
+    private String common;
+
 }

fs-service/src/main/java/com/fs/course/param/newfs/FsUserCourseAddCompanyUserParam.java

@@ -33,7 +33,7 @@ public class FsUserCourseAddCompanyUserParam implements Serializable {
     @ApiModelProperty(value = "营期id")
     private Long periodId;
 
-//    @NotNull(message = "项目id不能为空")
+    @NotNull(message = "项目id不能为空")
     @ApiModelProperty(value = "项目ID")
     private Long projectId;
     private Integer isOpenCourse;

fs-service/src/main/java/com/fs/course/service/IFsUserCoursePeriodDaysService.java

@@ -117,4 +117,6 @@ public interface IFsUserCoursePeriodDaysService extends IService<FsUserCoursePer
      * 更新营期课程状态
      */
     void changePeriodCourseStatus();
-}
+
+        long periodCourseByCount(PeriodCountParam param);
+    }

fs-service/src/main/java/com/fs/course/service/impl/FsCourseTrafficLogServiceImpl.java

@@ -183,6 +183,9 @@ public class FsCourseTrafficLogServiceImpl implements IFsCourseTrafficLogService
         if(StringUtils.isBlank(param.getStartDate()) && StringUtils.isBlank(param.getEndDate())){
             throw new CustomException("搜索必须要一个时间范围!");
         }
+        if (ObjectUtils.isNotEmpty(param.getTabType())&&param.getTabType().equals("common")){
+            param.setCommon(param.getTabType());
+        }
         List<FsCourseTrafficLogListVO> fsCourseTrafficLogListVOS = fsCourseTrafficLogMapper.selectTrafficNew(param);
         for (FsCourseTrafficLogListVO log : fsCourseTrafficLogListVOS) {
             if (ObjectUtils.isNotNull(log.getProject())) {

fs-service/src/main/java/com/fs/course/service/impl/FsCourseWatchLogServiceImpl.java

@@ -1068,8 +1068,8 @@ public class FsCourseWatchLogServiceImpl extends ServiceImpl<FsCourseWatchLogMap
             if(ObjectUtils.isNotNull(item.getUserId())) {
                 FsUser fsUser = fsUserCacheService.selectFsUserById(item.getUserId());
                 if(ObjectUtils.isNotNull(fsUser)){
-                    item.setExternalUserName(String.format("%s_%d",fsUser.getNickname(),fsUser.getUserId()));
-                    item.setFsNickName(fsUser.getNickname());
+                    item.setExternalUserName(String.format("%s_%d",fsUser.getNickName(),fsUser.getUserId()));
+                    item.setFsNickName(fsUser.getNickName());
                     item.setFsAvatar(fsUser.getAvatar());
                 }
             }

fs-service/src/main/java/com/fs/course/service/impl/FsUserCoursePeriodDaysServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fs.course.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -8,6 +9,7 @@ import com.fs.common.utils.DateUtils;
 import com.fs.common.utils.PubFun;
 import com.fs.common.utils.date.DateUtil;
 import com.fs.common.utils.date.TimeTypeEnum;
+import com.fs.company.domain.CompanyDomain;
 import com.fs.course.domain.FsUserCoursePeriod;
 import com.fs.course.domain.FsUserCoursePeriodDays;
 import com.fs.course.domain.FsUserCourseVideo;
@@ -25,6 +27,7 @@ import com.fs.course.vo.UpdateCourseTimeVo;
 import com.fs.course.vo.newfs.FsCourseAnalysisCountVO;
 import com.fs.his.mapper.FsUserMapper;
 import com.fs.his.vo.OptionsVO;
+import com.fs.sop.domain.QwSopTempRules;
 import com.fs.system.domain.SysConfig;
 import com.fs.system.mapper.SysConfigMapper;
 import lombok.AllArgsConstructor;
@@ -405,6 +408,17 @@ public class FsUserCoursePeriodDaysServiceImpl extends ServiceImpl<FsUserCourseP
         fsUserCoursePeriodDaysMapper.endPeriodCourse(LocalDateTime.now());
     }
 
+    @Override
+    public long periodCourseByCount(PeriodCountParam param) {
+        //1、查询课程视频信息
+        FsUserCoursePeriodDays fsUserCoursePeriodDays = new FsUserCoursePeriodDays();
+        fsUserCoursePeriodDays.setPeriodId(param.getPeriodId());
+        fsUserCoursePeriodDays.setVideoIds(param.getVideoIdList());
+        fsUserCoursePeriodDays.setMaxDate(param.getMaxDate());
+
+        return baseMapper.selectFsUserCoursePeriodDaysCount(fsUserCoursePeriodDays);
+    }
+
     private static FsCourseAnalysisCountVO getCourseAnalysisCountVO(FsUserCoursePeriodDays v, Map<Long, FsCourseAnalysisCountVO> courseMap, Map<Long, FsCourseAnalysisCountVO> redPacketMap, Map<Long, FsCourseAnalysisCountVO> answerMap) {
         FsCourseAnalysisCountVO countVO = new FsCourseAnalysisCountVO();
         FsCourseAnalysisCountVO courseVO = courseMap.getOrDefault(v.getVideoId(), countVO);

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

@@ -22,6 +22,7 @@ import com.fs.company.domain.CompanyUser;
 import com.fs.company.mapper.CompanyMapper;
 import com.fs.company.mapper.CompanyMoneyLogsMapper;
 import com.fs.company.mapper.CompanyUserMapper;
+import com.fs.company.service.ICompanyService;
 import com.fs.course.config.CourseConfig;
 import com.fs.course.domain.*;
 import com.fs.course.dto.CoursePackageDTO;
@@ -107,7 +108,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     private static final String miniappRealLink = "/pages_course/video.html?course=";
     private static final String REAL_LINK_PREFIX = "/courseH5/pages/course/learning?course=";
     private static final String SHORT_LINK_PREFIX = "/courseH5/pages/course/learning?s=";
-
+    @Autowired
+    ICompanyService companyService;
     @Autowired
     private CompanyMoneyLogsMapper moneyLogsMapper;
     @Autowired
@@ -265,6 +267,8 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             fsUserCourseVideo.setListingStartTime(null);
             fsUserCourseVideo.setListingEndTime(null);
         }
+        String videoRedisKey = "h5user:video:duration:" + fsUserCourseVideo.getVideoId();
+        redisCache.setCacheObject(videoRedisKey, fsUserCourseVideo.getDuration());
         return fsUserCourseVideoMapper.updateFsUserCourseVideo(fsUserCourseVideo);
     }
 
@@ -920,6 +924,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             // 积分奖励
             case 2:
                 return sendIntegralReward(param,user, log, config);
+            // 红包+积分
+            case 3:
+                R sendRed = sendRedPacketReward(param, user, log, video, config);
+                if (!Objects.equals(sendRed.get("code"), 200)) {
+                    return sendRed;
+                }
+                return sendIntegralReward(param,user, log, config);
             default:
                 return R.error("参数错误！");
         }
@@ -942,22 +953,28 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             logger.error("未答题：{}",param.getUserId());
             return R.error("未答题");
         }
-        if (log.getRewardType() != null) {
-            FsCourseRedPacketLog fsCourseRedPacketLog = redPacketLogMapper.selectUserFsCourseRedPacketLog(param.getVideoId(), param.getUserId(),param.getPeriodId());
-            if(fsCourseRedPacketLog != null && fsCourseRedPacketLog.getStatus() == 1) {
-                return R.error("已领取该课程奖励，不可重复领取！");
-            }
-            if(fsCourseRedPacketLog != null && fsCourseRedPacketLog.getStatus() == 0) {
-                if(StringUtils.isNotEmpty(fsCourseRedPacketLog.getResult())){
-                    R r = JSON.parseObject(fsCourseRedPacketLog.getResult(), R.class);
-                    return r;
-                } else {
-                    return R.error("操作频繁，请稍后再试！");
+        if (log.getRewardType() != null ) {
+            if (log.getRewardType() == 1){
+                FsCourseRedPacketLog fsCourseRedPacketLog = redPacketLogMapper.selectUserFsCourseRedPacketLog(param.getVideoId(), param.getUserId(),param.getPeriodId());
+                if(fsCourseRedPacketLog != null && fsCourseRedPacketLog.getStatus() == 1) {
+                    return R.error("已领取该课程奖励，不可重复领取！");
                 }
+                if(fsCourseRedPacketLog != null && fsCourseRedPacketLog.getStatus() == 0) {
+                    if(StringUtils.isNotEmpty(fsCourseRedPacketLog.getResult())){
+                        R r = JSON.parseObject(fsCourseRedPacketLog.getResult(), R.class);
+                        return r;
+                    } else {
+                        return R.error("操作频繁，请稍后再试！");
+                    }
+                }
+            }else if (log.getRewardType() == 2){
+                return R.error("已领取该课程奖励，不可重复领取！");
             }
+
         }
 
 
+
         // 获取视频信息
         FsUserCourseVideo video = fsUserCourseVideoMapper.selectFsUserCourseVideoByVideoId(param.getVideoId());
 
@@ -979,6 +996,13 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             // 积分奖励
             case 2:
                 return sendIntegralReward(param,user, log, config);
+            // 红包+积分
+            case 3:
+                R sendRed = sendRedPacketReward(param, user, log, video, config);
+                if (!Objects.equals(sendRed.get("code"), 200)) {
+                    return sendRed;
+                }
+                return sendIntegralReward(param,user, log, config);
             default:
                 return R.error("参数错误！");
         }
@@ -1189,27 +1213,32 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
 //            if (company.getCourseMiniAppId()==null){
 //                return R.error("销售公司参数错误，未绑定小程序");
 //            }
-            FsUserWx fsUserWx = fsUserWxService.selectByAppIdAndUserId(param.getAppId(),user.getUserId(),1);
-            if (fsUserWx ==null){
-                if (user.getCourseMaOpenId()==null){
-                    logger.error("zyp \n 【转账openId参数错误】：{}", user.getUserId());
-                    return R.error("openId参数错误");
-                }
-                packetParam.setOpenId(user.getCourseMaOpenId());
-                try {
-                    handleFsUserWx(user,param.getAppId());
-                }catch (Exception e){
-                    logger.error("zyp \n 【更新或插入用户与小程序的绑定关系失败】：{}", user.getUserId(),e);
-                }
+//            if (user.getMpOpenId()!=null){
+//                packetParam.setOpenId(user.getMpOpenId());
+//            }else {
+                FsUserWx fsUserWx = fsUserWxService.selectByAppIdAndUserId(param.getAppId(),user.getUserId(),1);
+                if (fsUserWx ==null){
+                    if (user.getCourseMaOpenId()==null){
+                        logger.error("zyp \n 【转账openId参数错误】：{}", user.getUserId());
+                        return R.error("openId参数错误");
+                    }
+                    packetParam.setOpenId(user.getCourseMaOpenId());
+                    try {
+                        handleFsUserWx(user,param.getAppId());
+                    }catch (Exception e){
+                        logger.error("zyp \n 【更新或插入用户与小程序的绑定关系失败】：{}", user.getUserId(),e);
+                    }
 
-            }else {
-                packetParam.setOpenId(fsUserWx.getOpenId());
+                }else {
+                    packetParam.setOpenId(fsUserWx.getOpenId());
+                }
             }
-        }
+//        }
         //判断服务号配置是否存在
         if (StringUtils.isNotEmpty(config.getMpAppId())){
             packetParam.setMpAppId(config.getMpAppId());
         }
+        //组装发红包数据
         packetParam.setAmount(amount);
         packetParam.setSource(param.getSource());
         packetParam.setRedPacketMode(config.getRedPacketMode());
@@ -1225,6 +1254,11 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         //2025.6.19 红包金额为0的时候
         if (amount.compareTo(BigDecimal.ZERO)>0){
 
+            Company company = companyMapper.selectCompanyById(param.getCompanyId());
+            BigDecimal money = company.getMoney();
+            if (money.compareTo(BigDecimal.ZERO)<0) {
+                return R.error("服务商余额不足，请联系群主服务器充值!");
+            }
             // 发送红包
             R sendRedPacket = paymentService.sendRedPacket(packetParam);
             if (sendRedPacket.get("code").equals(200)) {
@@ -1515,9 +1549,10 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
     @Transactional
     public ResponseResult<FsUser> isAddCompanyUser(FsUserCourseAddCompanyUserParam param) {
         logger.info("\n 【进入个微-判断是否添加客服】，入参：{}",param);
+
         //查询用户
-        FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
-        if (fsUser == null){
+       FsUser fsUser = fsUserMapper.selectFsUserById(param.getUserId());
+         if (fsUser == null){
             return ResponseResult.fail(404,"当前用户信息不存在");
         }
         //公开课
@@ -1553,8 +1588,22 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         //2、如果只绑定了当前销售，需要添加看课记录（正常流程）；
         //3、以上都不是，则标识重粉，需要加入关系表，并打上重粉标签
         FsUserCompanyUser userCompanyUser = userCompanyUserService.selectByUserIdAndProjectId(fsUser.getUserId(), param.getProjectId());
+
+        // 添加逻辑：如果存在fs_user表数据，但是又不存在fs_user_company_user表，则表示是以前企微看课的，需要手动绑定
+        if(Objects.isNull(userCompanyUser) && fsUser.getCompanyUserId() == null && fsUser.getIsAddQw() == 1){
+            userCompanyUserService.bindRelationship(fsUser.getUserId(), param.getProjectId(), param.getCompanyId(), param.getCompanyUserId(), 1);
+        }
+
         if(Objects.isNull(userCompanyUser)) {
-            return ResponseResult.fail(BizResponseEnum.DATA_NOT_EXIST, getCompanyUserQRCode(companyUser));
+            Company company = companyService.selectCompanyById(param.getCompanyId());
+            if((companyUser.getIsAllowedAllRegister() !=null && companyUser.getIsAllowedAllRegister() != 1)){
+                return ResponseResult.fail(504,"当前销售禁止绑定会员，请联系销售！");
+            }
+            if (companyUser.getIsNeedRegisterMember() == null || companyUser.getIsNeedRegisterMember() == 1){
+                return ResponseResult.fail(504,"请联系销售发送邀请链接成为会员！");
+            }
+            int defaultStatus = (company != null ? company.getFsUserIsDefaultBlack() : 0) == 1 ? 0 : 1;
+            userCompanyUser = userCompanyUserService.bindRelationship(param.getUserId(), param.getProjectId(), companyUser.getCompanyId(), companyUser.getUserId(), defaultStatus);
         }
 
         // 逻辑调整：如果会员已经绑定了销售，直接提示，不添加重粉数据了-2025年6月16日14点53分
@@ -1595,7 +1644,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
             return ResponseResult.fail(504, "请观看最新的课程项目");
         }
         // 项目看课数限制
-        if(!"福本源".equals(signProjectName)) {
+        if(!"福本源".equals(signProjectName) && !"宽益堂".equals(signProjectName)) {
             Integer logCount = fsUserCourseMapper.selectTodayCourseWatchLogCountByUserIdAndProjectId(param.getUserId(), param.getProjectId());
             if (Objects.isNull(watchCourseVideo) && logCount > 0) {
                 return ResponseResult.fail(504, "超过项目看课数量限制");
@@ -1826,6 +1875,7 @@ public class FsUserCourseVideoServiceImpl implements IFsUserCourseVideoService
         vo.setPlayDuration(duration);
         //判断营期的课程状态是否是进行中
         if(param.getId() != null){
+
             FsUserCoursePeriodDays days = fsUserCoursePeriodDaysMapper.selectById(param.getId());
 
             // 查询销售设置的看课时间

fs-service/src/main/java/com/fs/his/domain/FsInquiryPatientInfo.java

@@ -0,0 +1,94 @@
+package com.fs.his.domain;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fs.common.core.domain.BaseEntity;
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class FsInquiryPatientInfo extends BaseEntity {
+
+    /** ID */
+    private Long id;
+
+    /**
+     * 患者id
+     */
+    private Long patientId;
+
+    /**
+     * 销售id
+     */
+    private Long companyUserId;
+    /**
+     * 患者会员id
+     */
+    private Long userId;
+    /**
+     * 问诊订单id
+     */
+    private Long inquiryOrderId;
+    /**
+     * 课程id
+     */
+    private Long courseId;
+
+    /**
+     * 就诊状态 1-初诊 2-复诊
+     */
+    private Integer diagnosisStatus;
+
+    /**
+     * 客户标签
+     */
+    private String tag;
+
+    /**
+     * 课程/档期
+     */
+    private String courseName;
+
+    /**
+     * 患者病情主诉
+     */
+    private String patientCondition;
+
+    /**
+     * 部门负责人
+     */
+    private String deptManager;
+
+    /**
+     * 医生建议及处置
+     */
+    private String doctorAdviceJson;
+
+    /**
+     * 禁忌
+     */
+    private String taboo;
+    /**
+     * 客户需求
+     */
+    private String customerRequire;
+
+    /**
+     * 职业医生
+     */
+    private String professionalDoctor;
+
+    /**
+     * 助理医生
+     */
+    private String assistantDoctor;
+
+    /**
+     * 预约时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date subTime;
+
+    private Long subDoctorId;
+
+}

fs-service/src/main/java/com/fs/his/mapper/FsInquiryPatientInfoMapper.java

@@ -0,0 +1,16 @@
+package com.fs.his.mapper;
+
+import com.fs.his.domain.FsInquiryPatientInfo;
+import com.fs.his.vo.FsInquiryPatientVO;
+import org.apache.ibatis.annotations.Select;
+
+public interface FsInquiryPatientInfoMapper {
+
+    int insertFsInquiryPatientInfo(FsInquiryPatientInfo fsInquiryPatientInfo);
+
+    int updateFsInquiryPatientInfo(FsInquiryPatientInfo fsInquiryPatientInfo);
+
+    FsInquiryPatientInfo selectFsInquiryPatientInfoInquiryOrderId(Long inquiryOrderId);
+
+    FsInquiryPatientVO selectUserAndCompanyUserByInquiryOrderId(Long inquiryOrderId);
+}

fs-service/src/main/java/com/fs/his/mapper/FsPackageMapper.java

@@ -112,13 +112,13 @@ public interface FsPackageMapper
     @Select({"<script> " +
             "select p.*  from fs_package p    " +
             "where p.status=1 and p.is_del=0   " +
-            "<if test = 'maps.keyword != null     '> " +
+            "<if test = 'maps.keyword != null and  maps.keyword != \"\"   '> " +
             "and ( p.package_name like CONCAT('%',#{maps.keyword},'%') or p.second_name like CONCAT('%',#{maps.keyword},'%')) " +
             "</if>" +
             "<if test = 'maps.diseaseType != null and maps.diseaseType !=0    '> " +
             "and p.disease_type = #{maps.diseaseType} " +
             "</if>" +
-            "<if test = 'maps.privateType != null'> " +
+            "<if test = 'maps.privateType != null and maps.privateType != 0'> " +
             "and p.private_type = #{maps.privateType} " +
             "</if>" +
             "<if test = 'maps.isShow != null '> " +