Merge remote-tracking branch 'origin/master'

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/hisStore/controller/FsStoreActivityScrmController.java

@@ -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/controller/FsStoreCouponIssueScrmController.java

@@ -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/controller/FsStoreCouponIssueUserScrmController.java

@@ -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/controller/FsStoreCouponScrmController.java

@@ -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/controller/FsStoreCouponUserScrmController.java

@@ -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-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -255,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;

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/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/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 '> " +

fs-service/src/main/java/com/fs/his/service/impl/FsPackageOrderServiceImpl.java

@@ -341,106 +341,106 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             return R.error("无效的类型参数");
         }
     }
-    public Map<String,Object> computeOrderMoney(BigDecimal orderPrice,FsPackageOrderComputeParam param){
-        Map<String,Object> moneys=new HashMap<>();
-        BigDecimal payPrice=orderPrice;
-        BigDecimal payMoney=new BigDecimal(0);
-        BigDecimal payRemain=new BigDecimal(0);
-        BigDecimal payDelivery=new BigDecimal(0);
-        BigDecimal discountMoney=new BigDecimal(0);
-        String json=configService.selectConfigByKey("his.package");
-        PackageConfigDTO configDTO=JSONUtil.toBean(json, PackageConfigDTO.class);
-        if(param.getUserCouponId()!=null&&param.getUserCouponId()>0l){
-            FsUserCoupon userCoupon=userCouponService.selectFsUserCouponById(param.getUserCouponId());
-            if(userCoupon==null){
-
-            }
-            if(userCoupon.getStatus()!=0){
+    public Map<String, Object> computeOrderMoney(BigDecimal orderPrice, FsPackageOrderComputeParam param) {
+        Map<String, Object> moneys = new HashMap<>();
+        BigDecimal payPrice = orderPrice;
+        BigDecimal payMoney = new BigDecimal(0);
+        BigDecimal payRemain = new BigDecimal(0);
+        BigDecimal payDelivery = new BigDecimal(0);
+        BigDecimal discountMoney = new BigDecimal(0);
+        String json = configService.selectConfigByKey("his.package");
+        PackageConfigDTO configDTO = JSONUtil.toBean(json, PackageConfigDTO.class);
+        if (param.getUserCouponId() != null && param.getUserCouponId() > 0l) {
+            FsUserCoupon userCoupon = userCouponService.selectFsUserCouponById(param.getUserCouponId());
+            if (userCoupon != null) {
+                if (userCoupon.getStatus() == 0) {
+                    FsCoupon coupon = couponService.selectFsCouponByCouponId(userCoupon.getCouponId());
+                    if (coupon.getCouponType().equals(1)) {
+                        if (coupon.getMinPrice().compareTo(orderPrice) <=0) {
+                            if (coupon.getPrice().compareTo(orderPrice) >= 0) {
+                                payPrice = new BigDecimal(0);
+                                discountMoney = coupon.getPrice();
+                            } else {
+                                payPrice = orderPrice.subtract(coupon.getPrice());
+                                discountMoney = coupon.getPrice();
+                            }
+                        }
+                        //中药免单券
+                    } else if (coupon.getCouponType().equals(2)) {
+                        payPrice = new BigDecimal(0);
+                        discountMoney = orderPrice;
+                        //问诊免单券
+                    } else if (coupon.getCouponType().equals(3)) {
+
+                        //中药打折券
+                    } else if (coupon.getCouponType().equals(4)) {
+                        payPrice = orderPrice.multiply(coupon.getRate()).divide(new BigDecimal(100));
+                        discountMoney = coupon.getPrice().subtract(orderPrice);
+                        //私域疗法券
+                    } else if (coupon.getCouponType().equals(5)) {
+                        if (coupon.getMinPrice().compareTo(orderPrice) <=0) {
+                            if (coupon.getPrice().compareTo(orderPrice) >= 0) {
+                                payPrice = new BigDecimal(0);
+                                discountMoney = coupon.getPrice();
+                            } else {
+                                payPrice = orderPrice.subtract(coupon.getPrice());
+                                discountMoney = coupon.getPrice();
 
-            }
-            FsCoupon coupon=couponService.selectFsCouponByCouponId(userCoupon.getCouponId());
-            if(coupon.getCouponType().equals(1)){
-                if(coupon.getMinPrice().compareTo(orderPrice)==1){
-
-                }
-                if(coupon.getPrice().compareTo(orderPrice)>=0){
-                    payPrice=new BigDecimal(0);
-                    discountMoney=coupon.getPrice();
-                }
-                else{
-                    payPrice=orderPrice.subtract(coupon.getPrice());
-                    discountMoney=coupon.getPrice();
 
+                            }
+                        }
+                        //公域疗法券
+                    }else if (coupon.getCouponType().equals(6)){
+                        if (coupon.getMinPrice().compareTo(orderPrice) >=0) {
+                            //throw  new ServiceException("优惠劵最低金额大于订单金额");
 
+                        }
+                        if (coupon.getPrice().compareTo(orderPrice) >= 0) {
+                            payPrice = new BigDecimal(0);
+                            discountMoney = coupon.getPrice();
+                        } else {
+                            payPrice = orderPrice.subtract(coupon.getPrice());
+                            discountMoney = coupon.getPrice();
+                        }
+                    }
                 }
             }
-            else if(coupon.getCouponType().equals(2)){
-                payPrice=new BigDecimal(0);
-                discountMoney=orderPrice;
-
-            }
-            else if(coupon.getCouponType().equals(3)){
-
-
-            }
-            else if(coupon.getCouponType().equals(4)){
-                payPrice= orderPrice.multiply(coupon.getRate()).divide(new BigDecimal(100));
-                discountMoney=coupon.getPrice().subtract(orderPrice);
 
-            }
-            else if(coupon.getCouponType().equals(5)){
-                if(coupon.getMinPrice().compareTo(orderPrice)==1){
 
-                }
-                if(coupon.getPrice().compareTo(orderPrice)>=0){
-                    payPrice=new BigDecimal(0);
-                    discountMoney=coupon.getPrice();
-                }
-                else{
-                    payPrice=orderPrice.subtract(coupon.getPrice());
-                    discountMoney=coupon.getPrice();
-
-
-                }
-
-            }
-        }
-        else{
-            payPrice=orderPrice;
-            discountMoney=new BigDecimal(0);
+        } else {
+            payPrice = orderPrice;
+            discountMoney = new BigDecimal(0);
         }
 
-        if(payPrice.compareTo(new BigDecimal(0))==1){
-            if(param.getPayType().equals(1)){
+        if (payPrice.compareTo(new BigDecimal(0)) == 1) {
+            if (param.getPayType().equals(1)) {
                 //全款
-                payMoney=payPrice;
-                payRemain=new BigDecimal(0);
-                payDelivery=new BigDecimal(0);
+                payMoney = payPrice;
+                payRemain = new BigDecimal(0);
+                payDelivery = new BigDecimal(0);
 
-            }
-            else if (param.getPayType().equals(2)){
+            } else if (param.getPayType().equals(2)) {
                 //代收
-                payMoney= payPrice.multiply(new BigDecimal((100-configDTO.getPayRate()))).divide(new BigDecimal(100));
-                payMoney=new BigDecimal(payMoney.setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
-                payRemain=payPrice.subtract(payMoney);
-                payDelivery=new BigDecimal(0);
-                if(payRemain.compareTo(new BigDecimal(0))==0){
-                    throw  new CustomException("代收金额应大于0");
+                payMoney = payPrice.multiply(new BigDecimal((100 - configDTO.getPayRate()))).divide(new BigDecimal(100));
+                payMoney = new BigDecimal(payMoney.setScale(0, BigDecimal.ROUND_HALF_UP).longValue());
+                payRemain = payPrice.subtract(payMoney);
+                payDelivery = new BigDecimal(0);
+                if (payRemain.compareTo(new BigDecimal(0)) == 0) {
+                    throw new CustomException("代收金额应大于0");
                 }
-            }
-            else if(param.getPayType().equals(3)){
+            } else if (param.getPayType().equals(3)) {
                 //货到付款
-                payMoney=configDTO.getPayDelivery();
-                payPrice=payPrice.add(configDTO.getPayDelivery());
-                payRemain=payPrice.subtract(configDTO.getPayDelivery());
-                payDelivery=configDTO.getPayDelivery();
+                payMoney = configDTO.getPayDelivery();
+                payPrice = payPrice.add(configDTO.getPayDelivery());
+                payRemain = payPrice.subtract(configDTO.getPayDelivery());
+                payDelivery = configDTO.getPayDelivery();
             }
         }
-        moneys.put("payPrice",payPrice);
-        moneys.put("payMoney",payMoney);
-        moneys.put("payRemain",payRemain);
-        moneys.put("payDelivery",payDelivery);
-        moneys.put("discountMoney",discountMoney);
+        moneys.put("payPrice", payPrice);
+        moneys.put("payMoney", payMoney);
+        moneys.put("payRemain", payRemain);
+        moneys.put("payDelivery", payDelivery);
+        moneys.put("discountMoney", discountMoney);
         List<StoreOrderProductDTO> gifts=new ArrayList<>();
         if(configDTO.getGiftStoreId()!=null&&param.getStoreId()!=null&&configDTO.getGiftStoreId().equals(param.getStoreId())&&param.getPayType()==1&&param.getCompanyId()!=null&&param.getCompanyUserId()!=null&&param.getCompanyId()>0&&payPrice.compareTo(configDTO.getGiftPrice())>=0){
             gifts=configDTO.getGift();
@@ -613,6 +613,19 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             computeParam.setUserCouponId(order.getUserCouponId());
         }
 
+        Map<String,Object> moneys=computeOrderMoney(order.getTotalPrice(),computeParam);
+        fsPackageOrder.setPayMoney((BigDecimal)moneys.get("payMoney"));
+        fsPackageOrder.setPayPrice((BigDecimal)moneys.get("payPrice"));
+        fsPackageOrder.setPayDelivery((BigDecimal)moneys.get("payDelivery"));
+        if (param.getUserCouponId()!=null&&param.getUserCouponId()>0){
+            fsPackageOrder.setUserCouponId(param.getUserCouponId());
+
+        }
+        fsPackageOrder.setDiscountMoney((BigDecimal)moneys.get("discountMoney"));
+        fsPackageOrder.setPayRemain((BigDecimal)moneys.get("payRemain"));
+        fsPackageOrder.setPayType(param.getPayType());
+        fsPackageOrderMapper.updateFsPackageOrder(fsPackageOrder);
+
         if (param.getUserCouponId()!=null&&param.getUserCouponId()>0){
             FsUserCoupon userCoupon=userCouponService.selectFsUserCouponById(param.getUserCouponId());
             FsCoupon coupon=couponService.selectFsCouponByCouponId(userCoupon.getCouponId());
@@ -626,19 +639,6 @@ public class FsPackageOrderServiceImpl implements IFsPackageOrderService
             userCouponService.updateFsUserCoupon(userCoupon);
         }
 
-
-        Map<String,Object> moneys=computeOrderMoney(order.getTotalPrice(),computeParam);
-        fsPackageOrder.setPayMoney((BigDecimal)moneys.get("payMoney"));
-        fsPackageOrder.setPayPrice((BigDecimal)moneys.get("payPrice"));
-        fsPackageOrder.setPayDelivery((BigDecimal)moneys.get("payDelivery"));
-        if (param.getUserCouponId()!=null&&param.getUserCouponId()>0){
-            fsPackageOrder.setUserCouponId(param.getUserCouponId());
-
-        }
-        fsPackageOrder.setDiscountMoney((BigDecimal)moneys.get("discountMoney"));
-        fsPackageOrder.setPayRemain((BigDecimal)moneys.get("payRemain"));
-        fsPackageOrder.setPayType(param.getPayType());
-        fsPackageOrderMapper.updateFsPackageOrder(fsPackageOrder);
         return R.ok();
 
     }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -1486,7 +1486,11 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService
             }
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(storeOrder.getCreateTime());
-            calendar.add(Calendar.MINUTE,config.getUnPayTime());
+            if(ObjectUtil.isNotEmpty(config.getUnPayTime())){
+                calendar.add(Calendar.MINUTE,config.getUnPayTime());
+            }else {
+                calendar.add(Calendar.MINUTE,30);
+            }
             SimpleDateFormat format = new   SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             String payLimitTime = format.format(calendar.getTime() );
             return R.ok().put("order", storeOrder).put("payLimitTime",payLimitTime);

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreProductScrmServiceImpl.java

@@ -299,7 +299,7 @@ public class FsStoreProductScrmServiceImpl implements IFsStoreProductScrmService
     public R addOrEdit(FsStoreProductAddEditParam param) {
         ProductAttrCountDto countDto=computedProductCount(param.getValues());
 
-        if(param.getProductId() != null){
+        if(ObjectUtil.isNotEmpty(param.getProductId())&&param.getProductId()>0){
             FsStoreProductScrm product=new FsStoreProductScrm();
             BeanUtils.copyProperties(param,product);
             product.setPrice(countDto.getMinPrice());

fs-service/src/main/java/com/fs/system/mapper/SysDictDataMapper.java

@@ -9,14 +9,14 @@ import org.apache.ibatis.annotations.Select;
 
 /**
  * 字典表 数据层
- * 
+ *
 
  */
 public interface SysDictDataMapper
 {
     /**
      * 根据条件分页查询字典数据
-     * 
+     *
      * @param dictData 字典数据信息
      * @return 字典数据集合信息
      */
@@ -24,7 +24,7 @@ public interface SysDictDataMapper
 
     /**
      * 根据字典类型查询字典数据
-     * 
+     *
      * @param dictType 字典类型
      * @return 字典数据集合信息
      */
@@ -32,7 +32,7 @@ public interface SysDictDataMapper
 
     /**
      * 根据字典类型和字典键值查询字典数据信息
-     * 
+     *
      * @param dictType 字典类型
      * @param dictValue 字典键值
      * @return 字典标签
@@ -41,7 +41,7 @@ public interface SysDictDataMapper
 
     /**
      * 根据字典数据ID查询信息
-     * 
+     *
      * @param dictCode 字典数据ID
      * @return 字典数据
      */
@@ -49,7 +49,7 @@ public interface SysDictDataMapper
 
     /**
      * 查询字典数据
-     * 
+     *
      * @param dictType 字典类型
      * @return 字典数据
      */
@@ -57,7 +57,7 @@ public interface SysDictDataMapper
 
     /**
      * 通过字典ID删除字典数据信息
-     * 
+     *
      * @param dictCode 字典数据ID
      * @return 结果
      */
@@ -65,7 +65,7 @@ public interface SysDictDataMapper
 
     /**
      * 批量删除字典数据信息
-     * 
+     *
      * @param dictCodes 需要删除的字典数据ID
      * @return 结果
      */
@@ -73,7 +73,7 @@ public interface SysDictDataMapper
 
     /**
      * 新增字典数据信息
-     * 
+     *
      * @param dictData 字典数据信息
      * @return 结果
      */
@@ -81,7 +81,7 @@ public interface SysDictDataMapper
 
     /**
      * 修改字典数据信息
-     * 
+     *
      * @param dictData 字典数据信息
      * @return 结果
      */
@@ -89,13 +89,13 @@ public interface SysDictDataMapper
 
     /**
      * 同步修改字典类型
-     * 
+     *
      * @param oldDictType 旧字典类型
      * @param newDictType 新旧字典类型
      * @return 结果
      */
     public int updateDictDataType(@Param("oldDictType") String oldDictType, @Param("newDictType") String newDictType);
-    @Select("select dict_type,dict_label,dict_value from sys_dict_data where dict_type =#{dictType}")
+    @Select("select dict_type,dict_label,dict_value from sys_dict_data where dict_type =#{dictType} and status = 0")
     List<DictVO> selectDictDataListByType(String dictType);
 
     SysDictData selectDictDataByTypeAndValue(@Param("type") String type, @Param("value") String value);

fs-service/src/main/resources/application-config-druid-syysy.yml

@@ -80,7 +80,7 @@ headerImg:
   imgUrl: https://ysy-1329817240.cos.ap-guangzhou.myqcloud.com/ysy/20250820/2c47e4f105b641b4a49df50a77338e32.png
 ipad:
   ipadUrl: http://ipad.ysya.top
-  aiApi:
+  aiApi: http://49.232.181.28:3000/api
 wx_miniapp_temp:
   pay_order_temp_id:
   inquiry_temp_id:

fs-service/src/main/resources/mapper/course/FsCourseTrafficLogMapper.xml

@@ -255,6 +255,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="project != null">
                 and project = ${project}
             </if>
+            <if test="common == null">
+                AND company_id IS NULL
+            </if>
+            <if test="common != null ">
+                AND company_id IS NOT NULL
+            </if>
         </where>
 
         <if test="tabType==null or tabType==''">

fs-user-app/src/main/java/com/fs/app/controller/AppLoginController.java

@@ -216,9 +216,9 @@ public class AppLoginController extends AppBaseController{
             return R.error("用户数据不存在");
         }
         FsUser userMap = findUserByPhone(param.getPhone());
-        if (userMap!=null){
-            return R.error("该手机号已绑定其他账号");
-        }
+//        if (userMap!=null){
+//            return R.error("该手机号已绑定其他账号");
+//        }
         user.setPhone(param.getPhone());
         user.setLoginDevice(param.getLoginDevice() != null ? param.getLoginDevice() : null );
         user.setSource(param.getSource()!= null ? param.getSource() : null);

fs-user-app/src/main/java/com/fs/app/controller/store/AppLoginScrmController.java

@@ -184,9 +184,9 @@ public class AppLoginScrmController extends AppBaseController {
             return R.error("用户数据不存在");
         }
         FsUserScrm userMap = userService.selectFsUserByPhone(param.getPhone());
-        if (userMap!=null){
-            return R.error("该手机号已绑定其他账号");
-        }
+//        if (userMap!=null){
+//            return R.error("该手机号已绑定其他账号");
+//        }
         user.setPhone(param.getPhone());
         userMap = new FsUserScrm();
         userMap.setUserId(user.getUserId());