ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/handler/GlobalExceptionHandler.java

@@ -149,7 +149,7 @@ public class GlobalExceptionHandler {
     public R<Void> handleException(Exception e, HttpServletRequest request) {
         String requestURI = request.getRequestURI();
         log.error("请求地址'{}',发生系统异常.", requestURI, e);
-        return R.fail("网络异常,请稍后重试");
+        return R.fail(e.getMessage());
     }
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/app/AppProductOrderExpressController.java

@@ -78,7 +78,6 @@ public class AppProductOrderExpressController extends BaseController {
     public R<JSONArray> querySpeed(@Validated(AddGroup.class)  ProductOrderExpressBo bo) {
         return R.ok(productOrderExpressApi.querySpeed(bo));
     }
-
     /**
      * 根据orderId 快递订单好查询记录
      * @param expressNo

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysAppBusinessProductController.java

@@ -112,19 +112,6 @@ public class SysAppBusinessProductController extends BaseController {
         return toAjax(appBusinessProductService.updateByBo(bo));
     }
 
-
-    /**
-     * 商品排序
-     * 权限system:businessProduct:editSort
-     */
-    @SaCheckPermission("system:businessProduct:editSort")
-    @Log(title = "商家商品", businessType = BusinessType.UPDATE)
-    @RepeatSubmit()
-    @PutMapping("editSortBatch")
-    public R<Void> editSortBatch(@RequestBody ProductSortBo bo) {
-        return toAjax(appBusinessProductService.editSortBatch(bo));
-    }
-
     /**
      * 删除商家商品
      *

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysBusinessController.java

@@ -227,7 +227,6 @@ public class SysBusinessController extends BaseController {
 
     /**
      * 修改服务类型
-     * 权限system:business:changeService
      * @param bo
      * @return
      */
@@ -241,18 +240,22 @@ public class SysBusinessController extends BaseController {
         return R.ok();
     }
 
+
+
     /**
-     * 商家排序
-     * 权限system:business:editSort
+     * 修改是否可预约
+     * @param bo
+     * @return
      */
-    @SaCheckPermission("system:business:editSort")
-    @Log(title = "商家商品", businessType = BusinessType.UPDATE)
+    @SaCheckPermission("system:business:changeAppointment")
+    @Log(title = "商家管理", businessType = BusinessType.UPDATE)
     @RepeatSubmit()
-    @PutMapping("editSortBatch")
-    public R<Void> editSortBatch(@RequestBody BusinessSortBo bo) {
-        return toAjax(sysBusinessService.editSortBatch(bo));
-    }
+    @PostMapping("changeAppointment")
 
+    public R<Void> changeAppointment( @RequestBody BusinessAppointmentBo bo) {
+        sysBusinessService.changeAppointment(bo);
+        return R.ok();
+    }
 
     /**
      * 修改门店编号(闪时送)

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysBusiness.java

@@ -289,9 +289,5 @@ public class SysBusiness extends BaseEntity {
     private Long districtId;
 
     private String yunli;
-    /**
-     * 排序
-     */
-    private Long sort;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BusinessCouponBo.java

@@ -75,7 +75,6 @@ public class BusinessCouponBo extends BaseEntity {
     @NotNull(message = "类型(1商家 2分类 3商品)不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long productScopeType;
 
-    private List<Long> productScopeTypes;
     /**
      * 折扣类型
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BusinessCouponTemplateBo.java

@@ -80,9 +80,9 @@ public class BusinessCouponTemplateBo extends BaseEntity {
     private BigDecimal usePrice;
 
     /**
-     * 类型(1商家 2分类 3商品 4配送 5新人)
+     * 类型(1商家 2分类 3商品)
      */
-    @NotNull(message = "类型(1商家 2分类 3商品 4配送 5新人)", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "类型(1商家 2分类 3商品)不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long productScopeType;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BusinessServiceBo.java

@@ -1,11 +1,8 @@
 package org.dromara.system.domain.bo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
-import java.util.Date;
 
 @Data
 public class BusinessServiceBo {
@@ -13,16 +10,21 @@ public class BusinessServiceBo {
      *商家id
      */
     private Long id;
-
     /**
-     * 日期(年费使用的)
+     * 服务类型0=包年服务费 1=单笔服务费
      */
-    @DateTimeFormat(pattern = "yyyy-MM-dd")
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    private Date expireDate;
+    private Long serviceType;
     /**
-     * 0 年费 1技术服务费
+     * 服务金额
      */
-    private Long serviceType;
-
+    private BigDecimal serviceAmount;
+    /**
+     * 缴费模式年费(serviceType=0,serviceAmountType=1)
+     * 单笔交易收取多少(serviceType=1,serviceAmountType=1)
+     */
+    private Long serviceAmountType;
+    /**
+     * 每stepAmount收费serviceAmount
+     */
+    private BigDecimal stepAmount;
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/BusinessSortBo.java

@@ -1,14 +0,0 @@
-package org.dromara.system.domain.bo;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class BusinessSortBo {
-    @NotNull
-    private List<Long> ids;
-    @NotNull
-    private Long sort;
-}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductOrderBo.java

@@ -179,14 +179,5 @@ public class ProductOrderBo extends BaseEntity {
     private String showUser;
 
     private String showBusiness;
-    /**
-     * 关键字
-     */
-    private String keyworkds;
-
-    /**
-     * 0无结算 1待结算 2已结算, 3无法结算
-     */
-    private Long settlement;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/ProductSortBo.java

@@ -1,14 +0,0 @@
-package org.dromara.system.domain.bo;
-
-import jakarta.validation.constraints.NotNull;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class ProductSortBo {
-    @NotNull
-    private List<Long> ids;
-    @NotNull
-    private Long sort;
-}

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysBusinessBo.java

@@ -307,9 +307,5 @@ public class SysBusinessBo extends BaseEntity {
      * 需要创建商户编号
      */
     private boolean createShopNo;
-    /**
-     * 排序
-     */
-    private Long sort;
 
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysBusinessVo.java

@@ -395,10 +395,4 @@ public class SysBusinessVo implements Serializable {
     private String districtName;
 
     private String yunli;
-
-    /**
-     * 排序
-     */
-    private Long sort;
-
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IAppBusinessProductService.java

@@ -195,6 +195,4 @@ public interface IAppBusinessProductService {
     int subStockMoreZero(Long productId, Long num);
 
     int offForceShelf(ProductOffShelfBo bo);
-
-    int editSortBatch(ProductSortBo bo);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysBusinessService.java

@@ -188,6 +188,4 @@ public interface ISysBusinessService {
     SysBusinessViewVo queryViewById(Long id);
 
     int editBusinessStatus(SysBusinessBo bo);
-
-    int editSortBatch(BusinessSortBo bo);
 }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/AppBusinessProductServiceImpl.java

@@ -657,16 +657,6 @@ public class AppBusinessProductServiceImpl implements IAppBusinessProductService
         return     baseMapper.update(updateWrapper);
     }
 
-    @Override
-    @Transactional
-    public int editSortBatch(ProductSortBo bo) {
-
-        UpdateWrapper<AppBusinessProduct> updateWrapper = new UpdateWrapper<>();
-        updateWrapper.in("id",bo.getIds())
-            .eq("sort", bo.getSort());
-        return    baseMapper.update(updateWrapper);
-    }
-
 
     /**
      * 获取商品属性

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BusinessCouponServiceImpl.java

@@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.dromara.system.domain.BusinessCoupon;
 import org.dromara.system.domain.BusinessCouponTemplate;
-import org.dromara.system.domain.ProductOrder;
 import org.dromara.system.domain.PromotionCoupon;
 import org.dromara.system.domain.bo.AppBusinessProductBo;
 import org.dromara.system.domain.bo.AppBusinessTypeBo;
@@ -27,7 +26,6 @@ import org.dromara.system.domain.bo.CouponCheckBo;
 import org.dromara.system.domain.bo.BusinessCouponBo;
 import org.dromara.system.domain.vo.*;
 import org.dromara.system.mapper.BusinessCouponTemplateMapper;
-import org.dromara.system.mapper.ProductOrderMapper;
 import org.dromara.system.service.IAppBusinessProductService;
 import org.dromara.system.service.IAppBusinessTypeService;
 import org.dromara.system.service.IBusinessCouponTemplateService;
@@ -65,9 +63,6 @@ public class BusinessCouponServiceImpl implements IBusinessCouponService {
 
     @Resource
     private BusinessCouponTemplateMapper businessCouponTemplateMapper;
-
-    @Resource
-    private ProductOrderMapper productOrderMapper;
     /**
      * 查询商家优惠劵
      *
@@ -144,7 +139,6 @@ public class BusinessCouponServiceImpl implements IBusinessCouponService {
         lqw.eq(bo.getValidStartTime() != null, BusinessCoupon::getValidStartTime, bo.getValidStartTime());
         lqw.eq(bo.getValidEndTime() != null, BusinessCoupon::getValidEndTime, bo.getValidEndTime());
         lqw.eq(bo.getProductScopeType() != null, BusinessCoupon::getProductScopeType, bo.getProductScopeType());
-        lqw.in(bo.getProductScopeTypes() != null, BusinessCoupon::getProductScopeType, bo.getProductScopeTypes());
         lqw.eq(bo.getDiscountType() != null, BusinessCoupon::getDiscountType, bo.getDiscountType());
         lqw.eq(bo.getDiscountPercent() != null, BusinessCoupon::getDiscountPercent, bo.getDiscountPercent());
         lqw.eq(bo.getDiscountPrice() != null, BusinessCoupon::getDiscountPrice, bo.getDiscountPrice());
@@ -265,7 +259,7 @@ public class BusinessCouponServiceImpl implements IBusinessCouponService {
         allFilter.setUserId(bo.getUserId());
         allFilter.setStatus(1L);
         allFilter.setEffective(true);
-        allFilter.setProductScopeTypes(List.of(1L, 5L));
+        allFilter.setProductScopeType(1L);
         allFilter.setAmount(bo.getAmount());
         allFilter.setBusinessId(bo.getBusinessId());
         List<BusinessCouponVo> allBusinessCouponVos = queryList(allFilter);
@@ -372,17 +366,6 @@ public class BusinessCouponServiceImpl implements IBusinessCouponService {
         if (ObjectUtil.notEqual(couponTemplate.getTakeType(), takeType)) {
             throw new ServiceException("领取方式不正确");
         }
-        //新人优惠券
-        if(couponTemplate.getProductScopeType() != null &&  couponTemplate.getProductScopeType() == 5L){
-            QueryWrapper<ProductOrder> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("business_id",  couponTemplate.getBusinessId());
-            queryWrapper.in("status", "1","2", "4", "5", "9");
-            queryWrapper.eq("user_id", userId);
-            Long count = productOrderMapper.selectCount(queryWrapper);
-            if(count > 0){
-                throw new ServiceException("只有新人才能领取!");
-            }
-        }
         QueryWrapper<BusinessCoupon> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("user_id", userId);
         queryWrapper.eq("template_id", couponTemplate.getId());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/BusinessSystemCouponOrderPriceCalculatorServiceImpl.java

@@ -39,7 +39,7 @@ public class BusinessSystemCouponOrderPriceCalculatorServiceImpl implements Orde
         Long userId = vo.getUserId();
         if (businessCouponId != null) {
             BusinessCouponVo coupon = businessCouponService.validCoupon(businessCouponId, userId);
-            if (coupon.getProductScopeType() !=4L) {
+            if (coupon.getProductScopeType() >= 1L || coupon.getProductScopeType() <= 3L) {
 
                 List<ProductOrderItemsVo> productOrderItemsVos = filterMatchCouponOrderItems(vo, coupon);
                 if (productOrderItemsVos.isEmpty()) {
@@ -78,12 +78,10 @@ public class BusinessSystemCouponOrderPriceCalculatorServiceImpl implements Orde
         Predicate<ProductOrderItemsVo> matchPredicate = null;
         List<Long> productScopeIds = coupon.getProductScopeIds();
         List<ProductOrderItemsVo> itemList = result.getItemsList();
-        //所有优惠券和新人优惠券
-        if (coupon.getProductScopeType() == 1L || coupon.getProductScopeType() == 5L) {
+        if (coupon.getProductScopeType() == 1L) {
             itemList.forEach(item->item.setBusinessCouponId(coupon.getId()));
             return itemList;
         } else if (coupon.getProductScopeType() == 2L) {
-            //类型优惠卷
             if (productScopeIds == null || productScopeIds.isEmpty()) {
                 return itemList;
             }
@@ -96,7 +94,6 @@ public class BusinessSystemCouponOrderPriceCalculatorServiceImpl implements Orde
             });
             return itemList.stream().filter(item -> productScopeIds.contains(item.getTypeId())).peek(item-> item.setBusinessCouponId(coupon.getId())).collect(Collectors.toList());
         } else if (coupon.getProductScopeType() == 3L) {
-            //商品优惠券
             if (productScopeIds == null || productScopeIds.isEmpty()) {
                 return itemList;
             }

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/ProductOrderServiceImpl.java

@@ -189,6 +189,7 @@ public class ProductOrderServiceImpl implements IProductOrderService {
         for (ProductOrderVo record : result.getRecords()) {
             record.setItemsList(productOrderItemsService.queryList(new ProductOrderItemsBo(record.getId())));
             record.setProductOrderPriceVo(productOrderPriceService.queryById(record.getId()));
+
         }
         return TableDataInfo.build(result);
     }
@@ -256,10 +257,8 @@ public class ProductOrderServiceImpl implements IProductOrderService {
         lqw.eq(StringUtils.isNotBlank(bo.getMobile()), ProductOrder::getMobile, bo.getMobile());
         lqw.eq(bo.getType() != null, ProductOrder::getType, bo.getType());
         lqw.eq(bo.getNum() != null, ProductOrder::getNum, bo.getNum());
-        lqw.eq(bo.getSettlement() != null, ProductOrder::getSettlement, bo.getSettlement());
         lqw.eq(StringUtils.isNotBlank(bo.getStatus()), ProductOrder::getStatus, bo.getStatus());
         lqw.eq(StringUtils.isNotBlank(bo.getShowBusiness()), ProductOrder::getShowBusiness, bo.getShowBusiness());
-        lqw.apply(StringUtils.isNotBlank(bo.getKeyworkds()), "locate({0}, order_no) > 0  or locate({0}, mobile) > 0  or locate({0}, product_name) > 0  ", bo.getKeyworkds());
         return lqw;
     }
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysBusinessServiceImpl.java

@@ -60,10 +60,6 @@ public class SysBusinessServiceImpl
     @Resource
     private ISysConfigService sysConfigService;
 
-
-    @Resource
-    private ISysContractService sysContractService;
-
     /**
      * 查询商家管理
      *
@@ -540,23 +536,13 @@ public class SysBusinessServiceImpl
     @Override
     @Transactional
     public void changeServiceByBo(BusinessServiceBo bo) {
-        if (bo.getServiceType() == 1L) {
-            SysContractVo vo = sysContractService.queryByDefaultService();
-            LambdaUpdateWrapper<SysBusiness> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(SysBusiness::getId, bo.getId());
-            updateWrapper.set(SysBusiness::getExpireDate, null);
-            updateWrapper.set(SysBusiness::getServiceType, vo.getServiceType());
-            updateWrapper.set(SysBusiness::getPayStatus, 2L);
-            baseMapper.update(updateWrapper);
-        }else{
-            SysContractVo vo = sysContractService.queryByService();
-            LambdaUpdateWrapper<SysBusiness> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(SysBusiness::getId, bo.getId());
-            updateWrapper.set(SysBusiness::getExpireDate, bo.getExpireDate());
-            updateWrapper.set(SysBusiness::getServiceType, vo.getServiceType());
-            updateWrapper.set(SysBusiness::getPayStatus, 1L);
-            baseMapper.update(updateWrapper);
-        }
+        LambdaUpdateWrapper<SysBusiness> updateWrapper = new LambdaUpdateWrapper<>();
+        updateWrapper.eq(SysBusiness::getId, bo.getId());
+        updateWrapper.set(SysBusiness::getServiceType, bo.getServiceType());
+        updateWrapper.set(SysBusiness::getServiceAmount, bo.getServiceType() == 2L ?  bo.getServiceAmount() : BigDecimal.ZERO);
+        updateWrapper.set(SysBusiness::getServiceAmountType, bo.getServiceAmountType());
+        updateWrapper.set(SysBusiness::getStepAmount, bo.getStepAmount());
+        baseMapper.update(updateWrapper);
     }
 
     @Override
@@ -683,15 +669,6 @@ public class SysBusinessServiceImpl
         return baseMapper.update(updateWrapper);
     }
 
-    @Override
-    @Transactional
-    public int editSortBatch(BusinessSortBo bo) {
-        LambdaUpdateWrapper<SysBusiness> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.in(SysBusiness::getId,  bo.getIds());
-        updateWrapper.set(SysBusiness::getSort, bo.getSort());
-        return baseMapper.update(updateWrapper);
-    }
-
     private QueryWrapper<SysBusiness> buildQueryWrapper(SysBusinessViewBo bo) {
         QueryWrapper<SysBusiness> qw = new QueryWrapper<>();
         qw.like(StringUtil.isNotBlank(bo.getArea()), "area",  bo.getArea());

ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysBusinessMapper.xml

@@ -192,7 +192,6 @@
         <result property="submitTime"    column="submit_time"    />
         <result property="nickname" column="nick_name"/>
         <result property="username" column="user_name"/>
-        <result property="sort" column="sort"/>
     </resultMap>
     <resultMap id="businessVo" type="org.dromara.system.domain.vo.SysBusinessVo">
         <result property="id" column="id"/>