基础配置

jiangqs

2023-06-06 92da9546e1b37b06f78671b34389b1dec9dfadfc

基础配置

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/constant/ConfigEnum.java

New file
@@ -0,0 +1,60 @@
package com.ruoyi.system.api.constant;

import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Getter;

import java.util.HashMap;
import java.util.Map;

/**
 * @ClassName ConfigEnum
 * @Description TODO
 * @Author jqs
 * @Date 2023/6/6 10:35
 * @Version 1.0
 */

@JsonFormat(shape = JsonFormat.Shape.OBJECT)
@Getter
public enum ConfigEnum {

    PLATFORM_SERVICE_PHONE("PLATFORM_SERVICE_PHONE", 2,"客服电话"),
    SHOP_EMERGENCY_DEGREE("SHOP_EMERGENCY_DEGREE", 2,"合作商任务紧急程度"),
    SHOP_FOLLOW_TYPE("SHOP_FOLLOW_TYPE", 2,"合作商跟进类型"),
    SHOP_CUSTOM_STATUS("SHOP_CUSTOM_STATUS", 2,"合作商状态"),
    SHOP_SOURCE_CHANNEL("SHOP_SOURCE_CHANNEL", 2,"来源渠道"),
    SHARE_INTEGRAL("SHARE_INTEGRAL", 2,"分享小程序可获得积分"),
    SUGGEST_PLATFORM_INTEGRAL("SUGGEST_PLATFORM_INTEGRAL", 2,"平台建议可获得积分"),
    SIGN_IN_INTEGRAL("SIGN_IN_INTEGRAL", 2,"每日签到可获得积分"),
    SUGGEST_SHOP_INTEGRAL("SUGGEST_SHOP_INTEGRAL", 2,"门店建议可获得积分"),
    ORDER_AUTO_CANCEL_TIME("ORDER_AUTO_CANCEL_TIME", 2,"C端订单自动取消时间"),
    PAY_MONEY_INTEGRAL("PAY_MONEY_INTEGRAL", 2,"购物满1元可获得积分"),
    MEMBER_SOURCE_CHANNEL("MEMBER_SOURCE_CHANNEL", 2,"会员来源"),
    MEMBER_CHARACTER("MEMBER_CHARACTER", 2,"会员性格"),
    MEMBER_LEVEL("MEMBER_LEVEL", 2,"会员等级"),
    MEMBER_TYPE("MEMBER_TYPE", 2,"会员类型"),
    NURSE_PROBLEM("NURSE_PROBLEM", 2,"调理问题"),
    HOME_SLOGAN("HOME_SLOGAN", 2,"首页广告语");




    private final String key;
    private final Integer keyType;
    private final String keyName;
    private static final Map<String, ConfigEnum> valueMap = new HashMap<>();
    static {
        for(ConfigEnum configEnum : ConfigEnum.values()) {
            valueMap.put(configEnum.keyName, configEnum);
        }
    }

    ConfigEnum(String key,Integer keyType, String keyName) {
        this.key = key;
        this.keyType = keyType;
        this.keyName = keyName;
    }
     public static ConfigEnum getByKeyName(String keyName) {
        return valueMap.get(keyName);
    }
 }

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/business/MerGoodsController.java

@@ -29,7 +29,7 @@
@RequestMapping("/mer/goods")
public class MerGoodsController {

    @Autowired
    @Resource
    private GoodsService goodsService;

    @RequestMapping(value = "/pageMerShopGoods", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ActivityController.java

@@ -22,7 +22,7 @@



    @Autowired
    @Resource
    private ActivityGoodsService activityGoodsService;

    @PostMapping("/getActivityGoods")

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/GoodsController.java

@@ -27,13 +27,13 @@
@RequestMapping("/goods")
public class GoodsController {

    @Autowired
    @Resource
    private GoodsService goodsService;

    @Autowired
    @Resource
    private GoodsFileService goodsFileService;

    @Autowired
    @Resource
    private ShopGoodsService shopGoodsService;

    @PostMapping("/getGoods")

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/concole/ShoppingCartController.java

@@ -19,7 +19,7 @@
@RequestMapping("/shoppingCart")
public class ShoppingCartController {

    @Autowired
    @Resource
    private ShoppingCartService shoppingCartService;

    @PostMapping("/deleteShoppingCart")

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppGoodsController.java

@@ -37,13 +37,13 @@
@RequestMapping("/app/goods")
public class AppGoodsController extends BaseController {

    @Autowired
    @Resource
    private GoodsService goodsService;

    @Autowired
    @Resource
    private RemoteMemberService memberService;

    @Autowired
    @Resource
    private ShoppingCartService shoppingCartService;

    @RequestMapping(value = "/getGoodsInfo", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/controller/miniapp/AppHomeController.java

@@ -38,10 +38,10 @@
public class AppHomeController extends BaseController {


    @Autowired
    @Resource
    private RemoteMemberService memberService;

    @Autowired
    @Resource
    private GoodsService goodsService;



 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/GoodsServiceImpl.java

@@ -208,7 +208,7 @@
        if(shopGoods!=null){
            shopGoods.setSalesPrice(merShopGoodsEditDto.getSalePrice());
            shopGoods.setServiceNum(merShopGoodsEditDto.getServiceNum());
            shopGoods.setUpdateTime(DateUtils.getNowDate());
            shopGoods.setUpdateTime(new Date());
            shopGoods.setUpdateUserId(merShopGoodsEditDto.getUserId());
        }else{
            shopGoods = new ShopGoods();
@@ -217,7 +217,7 @@
            shopGoods.setGoodsId(merShopGoodsEditDto.getGoodsId());
            shopGoods.setSalesPrice(merShopGoodsEditDto.getSalePrice());
            shopGoods.setServiceNum(merShopGoodsEditDto.getServiceNum());
            shopGoods.setUpdateTime(DateUtils.getNowDate());
            shopGoods.setUpdateTime(new Date());
            shopGoods.setUpdateUserId(merShopGoodsEditDto.getUserId());
        }
        shopGoodsService.saveOrUpdate(shopGoods);
@@ -288,11 +288,11 @@
            goodsId = IdUtils.simpleUUID();
            goods.setGoodsId(goodsId);
            goods.setDelFlag(0);
            goods.setCreateTime(DateUtils.getNowDate());
            goods.setCreateTime(new Date());
            goods.setCreateUserId(mgtGoodsEditDto.getUserId());
            newGoods = true;
        }
        goods.setUpdateTime(DateUtils.getNowDate());
        goods.setUpdateTime(new Date());
        goods.setUpdateUserId(mgtGoodsEditDto.getUserId());
        goods.setGoodsStatus(mgtGoodsEditDto.getGoodsStatus());
        goods.setGoodsType(mgtGoodsEditDto.getGoodsType());
@@ -368,7 +368,7 @@
            throw new ServiceException(AppErrorConstant.GOODS_DELETED);
        }
        goods.setGoodsStatus(mgtGoodsUpDownDto.getGoodsStatus());
        goods.setUpdateTime(DateUtils.getNowDate());
        goods.setUpdateTime(new Date());
        goods.setUpdateUserId(mgtGoodsUpDownDto.getUserId());
        this.saveOrUpdate(goods);
    }
@@ -387,7 +387,7 @@
            throw new ServiceException(AppErrorConstant.GOODS_DELETED);
        }
        goods.setRecommendFlag(mgtGoodsRecommendDto.getRecommendFlag());
        goods.setUpdateTime(DateUtils.getNowDate());
        goods.setUpdateTime(new Date());
        goods.setUpdateUserId(mgtGoodsRecommendDto.getUserId());
        this.saveOrUpdate(goods);
    }
@@ -404,7 +404,7 @@
        Goods goods = this.getById(goodsId);
        goods.setDelFlag(1);
        goods.setGoodsStatus(-1);
        goods.setUpdateTime(DateUtils.getNowDate());
        goods.setUpdateTime(new Date());
        goods.setUpdateUserId(userId);
        this.saveOrUpdate(goods);
    }

 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/service/impl/goods/ShoppingCartServiceImpl.java

@@ -4,10 +4,8 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.goods.domain.dto.AppShoppingCartAddDto;
import com.ruoyi.goods.domain.dto.AppShoppingCartChangeDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import com.ruoyi.goods.domain.pojo.goods.ShoppingCart;
import com.ruoyi.goods.domain.vo.AppShoppingCartVo;
import com.ruoyi.goods.mapper.goods.ShoppingCartMapper;
@@ -15,6 +13,7 @@
import com.ruoyi.goods.service.goods.ShoppingCartService;
import com.ruoyi.system.api.constant.AppErrorConstant;
import com.ruoyi.system.api.domain.dto.AppBaseBathDto;
import com.ruoyi.system.api.domain.poji.goods.Goods;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
@@ -63,11 +62,11 @@
            shoppingCart.setGoodsId(appShoppingCartAddDto.getGoodsId());
            shoppingCart.setBuyNum(appShoppingCartAddDto.getBuyNum());
            shoppingCart.setDelFlag(0);
            shoppingCart.setCreateTime(DateUtils.getNowDate());
            shoppingCart.setCreateTime(new Date());
            this.save(shoppingCart);
        }else{
            shoppingCart.setBuyNum(shoppingCart.getBuyNum()+appShoppingCartAddDto.getBuyNum());
            shoppingCart.setUpdateTime(DateUtils.getNowDate());
            shoppingCart.setUpdateTime(new Date());
            this.saveOrUpdate(shoppingCart);
        }
    }
@@ -86,7 +85,7 @@
            throw new ServiceException(AppErrorConstant.GOODS_DOWN);
        }
        shoppingCart.setBuyNum(appShoppingCartChangeDto.getBuyNum());
        shoppingCart.setUpdateTime(DateUtils.getNowDate());
        shoppingCart.setUpdateTime(new Date());
        this.saveOrUpdate(shoppingCart);
    }


 ruoyi-modules/ruoyi-goods/src/main/java/com/ruoyi/goods/util/CodeFactoryUtil.java

@@ -28,8 +28,8 @@
    //静态住入到自己的类中
    private static RedisService redisService;

    //将静态属性以入参（形参）的方式传入一个方法中，然后将此方法通过 @Autowired 注入到Spring容器中
    @Autowired
    //将静态属性以入参（形参）的方式传入一个方法中，然后将此方法通过 @Resource 注入到Spring容器中
    @Resource
    public void setService(RedisService redisService) {
        CodeFactoryUtil.redisService = redisService;
    }

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/business/MerMemberController.java

@@ -31,7 +31,7 @@
@RequestMapping("/mer/member")
public class MerMemberController {

    @Autowired
    @Resource
    private MemberService memberService;



 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/MemberController.java

@@ -23,10 +23,10 @@
@RequestMapping("/member")
public class MemberController extends BaseController {

    @Autowired
    @Resource
    private MemberService memberService;

    @Autowired
    @Resource
    private MemberCouponService memberCouponService;

    /**

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/management/MgtMemberController.java

@@ -7,17 +7,17 @@
import com.ruoyi.member.domain.vo.*;
import com.ruoyi.member.service.member.BrowseRecordService;
import com.ruoyi.member.service.member.IntegralRecordService;
import com.ruoyi.member.service.member.MemberArchiveFieldsService;
import com.ruoyi.member.service.member.MemberService;
import com.ruoyi.system.api.domain.dto.MerBaseGetDto;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.util.List;

/**
@@ -33,14 +33,17 @@
public class MgtMemberController {


    @Autowired
    @Resource
    private MemberService memberService;

    @Autowired
    @Resource
    private IntegralRecordService integralRecordService;

    @Autowired
    @Resource
    private BrowseRecordService browseRecordService;

    @Resource
    private MemberArchiveFieldsService memberArchiveFieldsService;

    @RequestMapping(value = "/pageMgtMember", method = RequestMethod.POST)
    @ApiOperation(value = "分页获取会员列表")
@@ -114,5 +117,12 @@
        return R.ok(page.setRecords(mgtMemberBrowsePageVoList));
    }


    @RequestMapping(value = "/editMemberArchiveFields", method = RequestMethod.POST)
    @ApiOperation(value = "编辑会员档案")
    public R editMemberArchiveFields(@RequestBody MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto) {
        Long userId = SecurityUtils.getUserId();
        mgtArchiveFieldsEditDto.setUserId(userId);
        memberArchiveFieldsService.editMemberArchiveFields(mgtArchiveFieldsEditDto);
        return R.ok();
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppMemberController.java

@@ -32,10 +32,10 @@
@RequestMapping("/app/member")
public class AppMemberController {

    @Autowired
    @Resource
    private MemberService memberService;

    @Autowired
    @Resource
    private MemberSuggestService memberSuggestService;



 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtArchiveFieldsEditDto.java

New file
@@ -0,0 +1,39 @@
package com.ruoyi.member.domain.dto;

import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @ClassName MgtArchiveFieldsEditDto
 * @Description TODO
 * @Author jqs
 * @Date 2023/6/6 9:34
 * @Version 1.0
 */
@Data
public class MgtArchiveFieldsEditDto extends MgtBaseDto {

    @ApiModelProperty(value = "档案id 新增不传")
    private Long afId;

    @ApiModelProperty(value = "字段名称")
    private String fieldName;

    @ApiModelProperty(value = "是否必填0否1是")
    private Integer requiredFlag;

    @ApiModelProperty(value = "字段排序")
    private Integer fieldSort;

    @ApiModelProperty(value = "字段类型1文字输入2数字输入3字母输入4无限制输入6年月日选择7选项")
    private Integer fieldType;

    @ApiModelProperty(value = "字段输入提示")
    private String inputTip;

    @ApiModelProperty(value = "选项值 多个,隔开")
    private String optionValues;


}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MgtArchiveOptionEditDto.java

New file
@@ -0,0 +1,24 @@
package com.ruoyi.member.domain.dto;

import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @ClassName MgtArchiveOptionEditDto
 * @Description TODO
 * @Author jqs
 * @Date 2023/6/6 9:37
 * @Version 1.0
 */
@Data
public class MgtArchiveOptionEditDto {

    @ApiModelProperty(value = "序号")
    private Integer serialNumber;


    @ApiModelProperty(value = "选项值")
    private String optionValue;


}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/pojo/member/MemberArchiveFields.java

@@ -1,15 +1,15 @@
package com.ruoyi.member.domain.pojo.member;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;

/**
 * <p>
@@ -33,7 +33,7 @@
     * 删除标记
     */
    @TableField("del_flag")
    private String delFlag;
    private Integer delFlag;
    /**
     * 字段名称
     */
@@ -53,7 +53,7 @@
     * 字段排序
     */
    @TableField("field_sort")
    private String fieldSort;
    private Integer fieldSort;
    /**
     * 输入提示
     */

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberArchiveFieldsServiceImpl.java

@@ -1,5 +1,6 @@
package com.ruoyi.member.service.impl.member;

import com.ruoyi.member.domain.dto.MgtArchiveFieldsEditDto;
import com.ruoyi.member.domain.pojo.member.MemberArchiveFields;
import com.ruoyi.member.mapper.member.MemberArchiveFieldsMapper;
import com.ruoyi.member.service.member.MemberArchiveFieldsService;
@@ -17,4 +18,33 @@
@Service
public class MemberArchiveFieldsServiceImpl extends ServiceImpl<MemberArchiveFieldsMapper, MemberArchiveFields> implements MemberArchiveFieldsService {


    /**
     * @description  编辑会员档案字段
     * @author  jqs
     * @date    2023/6/6 10:13
     * @param mgtArchiveFieldsEditDto
     * @return  void
     */
    @Override
    public void editMemberArchiveFields(MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto) {
        // 根据afId获取会员档案字段信息
        MemberArchiveFields memberArchiveFields;
        if (mgtArchiveFieldsEditDto.getAfId() != null) {
            memberArchiveFields = this.getById(mgtArchiveFieldsEditDto.getAfId());
        } else {
            // 新建会员档案字段信息
            memberArchiveFields = new MemberArchiveFields();
            memberArchiveFields.setDelFlag(0);
        }
        // 更新会员档案字段信息
        memberArchiveFields.setFieldName(mgtArchiveFieldsEditDto.getFieldName());
        memberArchiveFields.setFieldType(mgtArchiveFieldsEditDto.getFieldType());
        memberArchiveFields.setRequiredFlag(mgtArchiveFieldsEditDto.getRequiredFlag());
        memberArchiveFields.setFieldSort(mgtArchiveFieldsEditDto.getFieldSort());
        memberArchiveFields.setInputTip(mgtArchiveFieldsEditDto.getInputTip());
        memberArchiveFields.setOptionValues(mgtArchiveFieldsEditDto.getOptionValues());
        // 保存或更新会员档案字段信息
        this.saveOrUpdate(memberArchiveFields);
    }
}

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberServiceImpl.java

@@ -242,7 +242,7 @@
            member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
            member.setMemberId(memberId);
            member.setBindingFlag(0);
            member.setCreateTime(DateUtils.getNowDate());
            member.setCreateTime(new Date());
            member.setMobile(mobile);
            initMemberTotal(memberId);
        }else{
@@ -324,7 +324,7 @@
        switch (editType){
            case 1:
                member.setNickName(editValue);
                member.setUpdateTime(DateUtils.getNowDate());
                member.setUpdateTime(new Date());
                member.setUpdateUserId(appEditUserDto.getUserId());
                this.saveOrUpdate(member);
                break;
@@ -332,13 +332,13 @@
                break;
            case 3:
                member.setGender(Integer.valueOf(editValue));
                member.setUpdateTime(DateUtils.getNowDate());
                member.setUpdateTime(new Date());
                member.setUpdateUserId(appEditUserDto.getUserId());
                this.saveOrUpdate(member);
                break;
            case 4:
                member.setBirthday(editValue);
                member.setUpdateTime(DateUtils.getNowDate());
                member.setUpdateTime(new Date());
                member.setUpdateUserId(appEditUserDto.getUserId());
                this.saveOrUpdate(member);
                break;
@@ -520,7 +520,7 @@
            member.setBindingFlag(1);
            member.setRelationShopId(merMemberAddDto.getShopId());
            member.setCustomerSource("商户添加");
            member.setCreateTime(DateUtils.getNowDate());
            member.setCreateTime(new Date());
            log.info("member-----------------"+member.toString());
            this.saveOrUpdate(member);
            initMemberTotal(memberId);
@@ -551,7 +551,7 @@
        member.setLevel(merMemberEditDto.getLevel());
        member.setBirthday(merMemberEditDto.getBirthday());
        member.setUpdateUserId(merMemberEditDto.getUserId());
        member.setUpdateTime(DateUtils.getNowDate());
        member.setUpdateTime(new Date());
        log.info("member-----------------"+member.toString());
        this.saveOrUpdate(member);
        SysUser sysUser = new SysUser();
@@ -614,7 +614,7 @@
        member.setDelFlag(0);
        member.setAvatar("https://hongruitang.oss-cn-beijing.aliyuncs.com/default.png");
        member.setBindingFlag(0);
        member.setCreateTime(DateUtils.getNowDate());
        member.setCreateTime(new Date());
        member.setCustomerSource("商户订单添加");
        this.saveOrUpdate(member);
        initMemberTotal(member.getMemberId());
@@ -666,7 +666,7 @@
    @Override
    public List<MgtMemberPageVo> pageMgtMember(Page page,MgtMemberPageDto merMemberPageDto){
        List<Activeness> activenessList = remoteConfigService.listActiveness().getData();
        Date nowDay = DateUtils.getNowDate();
        Date nowDay = new Date();
        //处理活跃度筛选
        activenessList.stream()
                .filter(activeness -> activeness.getActivenessId().equals(merMemberPageDto.getActivenessId()))
@@ -685,8 +685,8 @@
                MgtActivenessJudgeVo mgtActivenessJudgeVo;
                for(Activeness activeness : activenessList){
                    mgtActivenessJudgeVo = new MgtActivenessJudgeVo();
                    mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getEndDay()));
                    mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(DateUtils.getNowDate(),activeness.getStartDay()-1));
                    mgtActivenessJudgeVo.setStartDay(DateUtils.addDays(new Date(),activeness.getEndDay()));
                    mgtActivenessJudgeVo.setEndDay(DateUtils.addDays(new Date(),activeness.getStartDay()-1));
                    mgtActivenessJudgeVo.setActivenessName(activeness.getActivenessName());
                }
                //活跃度赋值
@@ -722,7 +722,7 @@
        member.setRelationShopId(shop.getShopId());
        member.setRelationShopName(shop.getShopName());
        member.setBindingFlag(1);
        member.setUpdateTime(DateUtils.getNowDate());
        member.setUpdateTime(new Date());
        member.setUpdateUserId(mgtMemberRelEditDto.getUserId());
        this.saveOrUpdate(member);
    }
@@ -736,7 +736,7 @@
    public void deleteMemberRelationShop(MgtMemberRelDelDto mgtMemberRelDelDto){
        Member member = this.getById(mgtMemberRelDelDto.getMemberUserId());
        member.setBindingFlag(0);
        member.setUpdateTime(DateUtils.getNowDate());
        member.setUpdateTime(new Date());
        member.setUpdateUserId(mgtMemberRelDelDto.getUserId());
        this.saveOrUpdate(member);
    }
@@ -801,7 +801,7 @@
            integralRecord.setChangeIntegral( 0-integer);
        }
        integralRecord.setSurpIntegral(useableIntegral);
        integralRecord.setCreateTime(DateUtils.getNowDate());
        integralRecord.setCreateTime(new Date());
        integralRecord.setOrderId(memberIntegralChangeDto.getOrderId());
        integralRecord.setOrderNo(memberIntegralChangeDto.getOrderNo());
        switch (recordType){

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberSuggestServiceImpl.java

@@ -51,7 +51,7 @@
        memberSuggest.setDelFlag(0);
        memberSuggest.setCreateUserId(appUserSuggestDto.getUserId());
        memberSuggest.setSuggestContent(appUserSuggestDto.getSuggestContent());
        memberSuggest.setCreateTime(DateUtils.getNowDate());
        memberSuggest.setCreateTime(new Date());
        memberSuggest.setSuggestType(appUserSuggestDto.getSuggestType());
        this.saveOrUpdate(memberSuggest);
    }

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberArchiveFieldsService.java

@@ -1,5 +1,6 @@
package com.ruoyi.member.service.member;

import com.ruoyi.member.domain.dto.MgtArchiveFieldsEditDto;
import com.ruoyi.member.domain.pojo.member.MemberArchiveFields;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -13,4 +14,12 @@
 */
public interface MemberArchiveFieldsService extends IService<MemberArchiveFields> {

    /**
     * @description  编辑会员档案字段
     * @author  jqs
     * @date    2023/6/6 10:13
     * @param mgtArchiveFieldsEditDto
     * @return  void
     */
    void editMemberArchiveFields(MgtArchiveFieldsEditDto mgtArchiveFieldsEditDto);
}

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerConsumerController.java

@@ -31,10 +31,10 @@
@RequestMapping("/mer/consumer")
public class MerConsumerController {

    @Autowired
    @Resource
    private ConsumerGoodsService consumerGoodsService;

    @Autowired
    @Resource
    private UserServiceRecordService userServiceRecordService;

    @RequestMapping(value = "/listMerConsumerGoods", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java

@@ -35,7 +35,7 @@
@RequestMapping("/mer/order")
public class MerOrderController {

    @Autowired
    @Resource
    private OrderService orderService;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/concole/OrderController.java

@@ -22,7 +22,7 @@
@RequestMapping("/order")
public class OrderController {

    @Autowired
    @Resource
    private OrderService orderService;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtMemberController.java

@@ -33,7 +33,7 @@
@RequestMapping("/mgt/member")
public class MgtMemberController {

    @Autowired
    @Resource
    private UserServiceRecordService userServiceRecordService;

    @RequestMapping(value = "/pageMgtMemberServiceRecord", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/management/MgtOrderController.java

@@ -35,7 +35,7 @@
@RequestMapping("/mgt/order")
public class MgtOrderController {

    @Autowired
    @Resource
    private OrderService orderService;

    @RequestMapping(value = "/getMgtMemberOrderTotal", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppConsumerController.java

@@ -32,13 +32,13 @@
@RequestMapping("/app/consumer")
public class AppConsumerController {

    @Autowired
    @Resource
    private RemoteMemberService memberService;

    @Autowired
    @Resource
    private ConsumerGoodsService consumerGoodsService;

    @Autowired
    @Resource
    private UserServiceRecordService userServiceRecordService;

    @RequestMapping(value = "/pageUserConsumerGoods", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/miniapp/AppOrderController.java

@@ -35,7 +35,7 @@



    @Autowired
    @Resource
    private OrderService orderService;



 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/ConsumerGoodsServiceImpl.java

@@ -4,7 +4,6 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.StringUtils;
import com.ruoyi.order.domain.dto.*;
import com.ruoyi.order.domain.pojo.order.ConsumerGoods;
@@ -112,10 +111,10 @@
                    throw new ServiceException(AppErrorConstant.BEYOND_SURP_NUM);
                }
                consumerGoods.setUsedNum(usedNum+useNum);
                consumerGoods.setUseTime(DateUtils.getNowDate());
                consumerGoods.setUseTime(new Date());
                if(consumerGoods.getUsedNum().equals(serviceNum)){
                    consumerGoods.setServiceStatus(2);
                    consumerGoods.setCompleteTime(DateUtils.getNowDate());
                    consumerGoods.setCompleteTime(new Date());
                }
                this.saveOrUpdate(consumerGoods);
                shopId = consumerGoods.getShopId();
@@ -133,7 +132,7 @@
                }
            }
            UserServiceRecord userServiceRecord = new UserServiceRecord();
            userServiceRecord.setCreateTime(DateUtils.getNowDate());
            userServiceRecord.setCreateTime(new Date());
            userServiceRecord.setServiceType(serviceType);
            userServiceRecord.setDelFlag(0);
            userServiceRecord.setShopId(shopId);

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java

@@ -373,7 +373,7 @@
        }
        order.setOrderRemark(appPlaceOrderDto.getOrderRemark());
        order.setGoodsNum(goodsNum);
        order.setCreateTime(DateUtils.getNowDate());
        order.setCreateTime(new Date());
        this.save(order);
        //更新用户商品类型
        if(goodsTypeSet!=null&&goodsTypeSet.size()>0){
@@ -474,7 +474,7 @@
            throw new ServiceException(AppErrorConstant.CANCEL_ERROR_ORDER);
        }
        order.setOrderStatus(0);
        order.setCancelTime(DateUtils.getNowDate());
        order.setCancelTime(new Date());
        this.saveOrUpdate(order);
    }

@@ -559,7 +559,7 @@
        String orderId = merVerifyOrderDto.getOrderId();
        BigDecimal relReceiveMoney = merVerifyOrderDto.getRelReceiveMoney();
        BigDecimal relPayMoney = merVerifyOrderDto.getRelPayMoney();
        Date nowTime = DateUtils.getNowDate();
        Date nowTime = new Date();
        //更新订单信息
        Order order = this.getById(orderId);
        order.setOrderStatus(3);
@@ -815,9 +815,9 @@
        }
        order.setOrderRemark(merNewOrderDto.getOrderRemark());
        order.setGoodsNum(goodsNum);
        order.setCreateTime(DateUtils.getNowDate());
        order.setPayTime(DateUtils.getNowDate());
        order.setUseTime(DateUtils.getNowDate());
        order.setCreateTime(new Date());
        order.setPayTime(new Date());
        order.setUseTime(new Date());
        order.setUseUserId(merNewOrderDto.getUserId());
        order.setPayMoney(merNewOrderDto.getPayMoney());
        order.setOnlinePayMoney(new BigDecimal("0.00"));
@@ -844,7 +844,7 @@
            consumerGoods.setServiceNum(appUserOrderGoodsPageVo.getServiceNum());
            consumerGoods.setUsedNum(0);
            consumerGoods.setGoodsType(appUserOrderGoodsPageVo.getGoodsType());
            consumerGoods.setCreateTime(DateUtils.getNowDate());
            consumerGoods.setCreateTime(new Date());
            consumerGoodsService.save(consumerGoods);
        }
        Member member = remoteMemberService.getMember(userId).getData();

 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/util/CodeFactoryUtil.java

@@ -28,8 +28,8 @@
    //静态住入到自己的类中
    private static RedisService redisService;

    //将静态属性以入参（形参）的方式传入一个方法中，然后将此方法通过 @Autowired 注入到Spring容器中
    @Autowired
    //将静态属性以入参（形参）的方式传入一个方法中，然后将此方法通过 @Resource 注入到Spring容器中
    @Resource
    public void setService(RedisService redisService) {
        CodeFactoryUtil.redisService = redisService;
    }

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerShopController.java

@@ -32,18 +32,18 @@
public class MerShopController {


    @Autowired
    @Resource
    private ShopService shopService;

    @Autowired
    @Resource
    private ShopCertificateService shopCertificateService;

    @Autowired
    @Resource
    private ShopStaffService shopStaffService;



    @Autowired
    @Resource
    private ShopSuggestService shopSuggestService;

    /**

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/business/MerTaskController.java

@@ -35,16 +35,16 @@
@RequestMapping("/mer/task")
public class MerTaskController {

    @Autowired
    @Resource
    private MemberTaskService memberTaskService;

    @Autowired
    @Resource
    private MemberTaskRecordService memberTaskRecordService;

    @Autowired
    @Resource
    private AgencyTaskService agencyTaskService;

    @Autowired
    @Resource
    private AgencyTaskRecordService agencyTaskRecordService;

    @RequestMapping(value = "/pageMerMemberTask", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtMemberController.java

@@ -31,7 +31,7 @@
public class MgtMemberController {


    @Autowired
    @Resource
    private MemberTaskRecordService memberTaskRecordService;

    @RequestMapping(value = "/pageMgtMemberFollow", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtShopController.java

@@ -32,10 +32,10 @@
@RequestMapping("/mgt/shop")
public class MgtShopController {

    @Autowired
    @Resource
    private ShopService shopService;

    @Autowired
    @Resource
    private ShopRelTagService shopRelTagService;

    @RequestMapping(value = "/pageMgtShop", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/management/MgtTaskController.java

@@ -37,13 +37,13 @@
@RequestMapping("/mgt/task")
public class MgtTaskController {

    @Autowired
    @Resource
    private ShopTaskService shopTaskService;

    @Autowired
    @Resource
    private AgencyTaskRecordService agencyTaskRecordService;

    @Autowired
    @Resource
    private ShopTaskRecordService shopTaskRecordService;

    @RequestMapping(value = "/followShopTask", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/miniapp/AppHomeController.java

@@ -33,12 +33,12 @@
public class AppHomeController {


    @Autowired
    @Resource
    private RemoteMemberService memberService;

    RemoteConfigService remoteConfigService;

    @Autowired
    @Resource
    private ShopService shopService;

    @RequestMapping(value = "/getNearbyShop", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java

@@ -129,7 +129,7 @@
        Boolean newShop = false;
        if(MGTEditShopDto.getShopId()!=null){
            shop = this.getById(MGTEditShopDto.getShopId());
            shop.setUpdateTime(DateUtils.getNowDate());
            shop.setUpdateTime(new Date());
            shop.setUpdateUserId(MGTEditShopDto.getUserId());
            shop.setShopTags(null);
            //清空关联记录
@@ -141,7 +141,7 @@
            shopStaffService.clearShopStaffRelation(shop.getShopId());
        }else{
            shop.setShopStatus(3);
            shop.setCreateTime(DateUtils.getNowDate());
            shop.setCreateTime(new Date());
            shop.setCreateUserId(MGTEditShopDto.getUserId());
            shop.setFrozenFlag(0);
            shop.setCooperativeFlag(0);
@@ -251,7 +251,7 @@
        try {
            Date coopStartDate = simpleDateFormat.parse(coopStartTime);
            Date coopEndDate = simpleDateFormat.parse(coopEndTime);
            Date nowTime = DateUtils.getNowDate();
            Date nowTime = new Date();
            shop.setCooperationStartTime(coopStartDate);
            shop.setCooperationEndTime(coopEndDate);
            Boolean inTime = false;

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopSuggestServiceImpl.java

@@ -52,7 +52,7 @@
        shopSuggest.setCreateUserId(merShopSuggestDto.getUserId());
        shopSuggest.setShopId(merShopSuggestDto.getShopId());
        shopSuggest.setSuggestContent(merShopSuggestDto.getSuggestContent());
        shopSuggest.setCreateTime(DateUtils.getNowDate());
        shopSuggest.setCreateTime(new Date());
        this.save(shopSuggest);
    }
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/AgencyTaskServiceImpl.java

@@ -47,7 +47,7 @@
     */
    @Override
    public List<MerAgencyTaskPageVo> pageMerAgencyTask(Page page, MerAgencyTaskPageDto merAgencyTaskPageDto){
        String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",DateUtils.getNowDate());
        String nowDay = DateUtils.parseDateToStr("YYYY-MM-dd",new Date());
        merAgencyTaskPageDto.setNowDay(nowDay);
        List<MerAgencyTaskPageVo> merAgencyTaskPageVoList = agencyTaskMapper.pageMerAgencyTask(page, merAgencyTaskPageDto);
        return merAgencyTaskPageVoList;
@@ -69,7 +69,7 @@
        agencyTask.setAgencyId(merCreateAgencyTaskDto.getAgencyId());
        agencyTask.setTaskDate(merCreateAgencyTaskDto.getTaskDate());
        agencyTask.setTaskContent(merCreateAgencyTaskDto.getTaskContent());
        agencyTask.setCreateTime(DateUtils.getNowDate());
        agencyTask.setCreateTime(new Date());
        this.saveOrUpdate(agencyTask);
    }

@@ -89,7 +89,7 @@
        agencyTaskRecord.setCallPhone(merFollowAgencyTaskDto.getCallPhone());
        agencyTaskRecord.setCallTime(merFollowAgencyTaskDto.getCallTime());
        agencyTaskRecord.setFollowContent(merFollowAgencyTaskDto.getFollowContent());
        agencyTaskRecord.setCreateTime(DateUtils.getNowDate());
        agencyTaskRecord.setCreateTime(new Date());
        agencyTaskRecordService.saveOrUpdate(agencyTaskRecord);
        //创建任务详情文件
        String picture = merFollowAgencyTaskDto.getPicture();
@@ -145,7 +145,7 @@
            agencyTask.setTaskDate(merFollowAgencyTaskDto.getNextTaskDate());
            agencyTask.setTaskContent(merFollowAgencyTaskDto.getNextTaskContent());
            agencyTask.setTaskStatus(2);
            agencyTask.setCreateTime(DateUtils.getNowDate());
            agencyTask.setCreateTime(new Date());
            this.saveOrUpdate(agencyTask);
        }


 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/MemberTaskServiceImpl.java

@@ -55,7 +55,7 @@
     */
    @Override
    public List<MerMemberTaskPageVo> pageMerMemberTask(Page page, MerMemberTaskPageDto merMemberTaskPageDto){
        String today = DateUtils.parseDateToStr("YYYY-MM-DD",DateUtils.getNowDate());
        String today = DateUtils.parseDateToStr("YYYY-MM-DD",new Date());
        List<MerMemberTaskPageVo> merMemberTaskPageVoList = memberTaskMapper.pageMerMemberTask(page, merMemberTaskPageDto);
        if(merMemberTaskPageVoList!=null&&!merMemberTaskPageVoList.isEmpty()){
            String taskDate;
@@ -86,7 +86,7 @@
        memberTask.setUserId(merCreateMemberTaskDto.getMemberUserId());
        memberTask.setTaskDate(merCreateMemberTaskDto.getTaskDate());
        memberTask.setTaskContent(merCreateMemberTaskDto.getTaskContent());
        memberTask.setCreateTime(DateUtils.getNowDate());
        memberTask.setCreateTime(new Date());
        this.saveOrUpdate(memberTask);
    }

@@ -105,7 +105,7 @@
        memberTaskRecord.setCallPhone(merFollowMemberTaskDto.getCallPhone());
        memberTaskRecord.setCallTime(merFollowMemberTaskDto.getCallTime());
        memberTaskRecord.setFollowContent(merFollowMemberTaskDto.getFollowContent());
        memberTaskRecord.setCreateTime(DateUtils.getNowDate());
        memberTaskRecord.setCreateTime(new Date());
        memberTaskRecordService.saveOrUpdate(memberTaskRecord);
        String picture = merFollowMemberTaskDto.getPicture();
        String video = merFollowMemberTaskDto.getVideo();
@@ -158,7 +158,7 @@
            memberTask.setTaskDate(merFollowMemberTaskDto.getNextTaskDate());
            memberTask.setTaskContent(merFollowMemberTaskDto.getNextTaskContent());
            memberTask.setTaskStatus(2);
            memberTask.setCreateTime(DateUtils.getNowDate());
            memberTask.setCreateTime(new Date());
            this.saveOrUpdate(memberTask);
        }
    }

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/task/ShopTaskServiceImpl.java

@@ -59,7 +59,7 @@
        shopTask.setNextFollowDate(DateUtils.getDate());
        shopTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
        shopTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
        shopTask.setCreateTime(DateUtils.getNowDate());
        shopTask.setCreateTime(new Date());
        this.saveOrUpdate(shopTask);
        //创建任务记录
        ShopTaskRecord shopTaskRecord = new ShopTaskRecord();
@@ -68,7 +68,7 @@
        shopTaskRecord.setUserId(mgtFollowShopTaskDto.getUserId());
        shopTaskRecord.setFollowType(2);
        shopTaskRecord.setFollowContent(mgtFollowShopTaskDto.getFollowContent());
        shopTaskRecord.setCreateTime(DateUtils.getNowDate());
        shopTaskRecord.setCreateTime(new Date());
        shopTaskRecordService.saveOrUpdate(shopTaskRecord);
        //创建任务文件
        String picture = mgtFollowShopTaskDto.getPicture();
@@ -96,7 +96,7 @@
        shopNextTask.setNextFollowDate(mgtFollowShopTaskDto.getNextTaskDate());
        shopNextTask.setTaskTitle(mgtFollowShopTaskDto.getNextTaskTitle());
        shopNextTask.setEmergencyState(mgtFollowShopTaskDto.getEmergencyState());
        shopNextTask.setCreateTime(DateUtils.getNowDate());
        shopNextTask.setCreateTime(new Date());
        this.saveOrUpdate(shopNextTask);
    }


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/business/MerConfigController.java

@@ -29,7 +29,7 @@
@RequestMapping("/mer/config")
public class MerConfigController {

    @Autowired
    @Resource
    private RecommendCooperationService recommendCooperationService;

    @RequestMapping(value = "/pageMerShopRecommend", method = RequestMethod.POST)

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java

New file
@@ -0,0 +1,55 @@
package com.ruoyi.system.controller.management;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.dto.MgtCooperationEditDto;
import com.ruoyi.system.domain.dto.MgtServiceMobileEditDto;
import com.ruoyi.system.service.config.CooperationService;
import com.ruoyi.system.service.config.CustomConfigService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @ClassName MgtConfigController
 * @Description TODO
 * @Author jqs
 * @Date 2023/6/6 9:14
 * @Version 1.0
 */
@Api(value = "平台端配置相关接口", tags = "平台端配置相关接口", description = "平台端配置相关接口")
@RestController
@RequestMapping("/mgt/config")
public class MgtConfigController {

    @Resource
    private CustomConfigService customConfigService;

    @Resource
    private CooperationService cooperationService;


    @RequestMapping(value = "/editCooperation", method = RequestMethod.POST)
    @ApiOperation(value = "修改申请合作")
    public R editCooperation(@RequestBody MgtCooperationEditDto mgtCooperationEditDto) {
        Long userId = SecurityUtils.getUserId();
        mgtCooperationEditDto.setUserId(userId);
        cooperationService.editCooperation(mgtCooperationEditDto);
        return R.ok();
    }

    @RequestMapping(value = "/editServiceMobile", method = RequestMethod.POST)
    @ApiOperation(value = "修改客服电话")
    public R editServiceMobile(@RequestBody MgtServiceMobileEditDto mgtServiceMobileEditDto) {
        Long userId = SecurityUtils.getUserId();
        mgtServiceMobileEditDto.setUserId(userId);
        customConfigService.editServiceMobile(mgtServiceMobileEditDto);
        return R.ok();
    }

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppConfigController.java

@@ -1,17 +1,17 @@
package com.ruoyi.system.controller.miniapp;

import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.domain.dto.AppAgreementDto;
import com.ruoyi.system.domain.vo.AppAgreementVo;
import com.ruoyi.system.service.config.AgreementService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @author jqs34
@@ -26,9 +26,8 @@
public class AppConfigController {


    @Autowired
    @Resource
    private AgreementService agreementService;



    @RequestMapping(value = "/getAppAgreement", method = RequestMethod.POST)
@@ -37,7 +36,6 @@
        AppAgreementVo appAgreementVo = agreementService.getAppAgreement(appAgreementDto);
        return R.ok(appAgreementVo);
    }



}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/miniapp/AppHomeController.java

@@ -30,13 +30,13 @@



    @Autowired
    @Resource
    private BannerService bannerService;

    @Autowired
    @Resource
    private QuickEntryService quickEntryService;

    @Autowired
    @Resource
    private AdvertService advertService;



 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtCooperationEditDto.java

New file
@@ -0,0 +1,26 @@
package com.ruoyi.system.domain.dto;

import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @ClassName MgtCooperationEditDto
 * @Description TODO
 * @Author jqs
 * @Date 2023/6/6 9:18
 * @Version 1.0
 */
@Data
public class MgtCooperationEditDto extends MgtBaseDto {

    @ApiModelProperty(value = "申请合作图片")
    private String cooperationPicture;

    @ApiModelProperty(value = "申请合作详情")
    private String cooperationDetail;




}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/dto/MgtServiceMobileEditDto.java

New file
@@ -0,0 +1,20 @@
package com.ruoyi.system.domain.dto;

import com.ruoyi.system.api.domain.dto.MgtBaseDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * @ClassName MgtServiceMobileEditDto
 * @Description TODO
 * @Author jqs
 * @Date 2023/6/6 11:47
 * @Version 1.0
 */
@Data
public class MgtServiceMobileEditDto extends MgtBaseDto {

    @ApiModelProperty(value = "客服电话 多个,隔开")
    private String serviceMobile;

}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/Cooperation.java

@@ -1,17 +1,16 @@
package com.ruoyi.system.domain.pojo.config;

import java.util.Date;

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;
import java.util.Date;

/**
 * <p>
@@ -58,7 +57,7 @@
     * 创建用户id
     */
    @TableField("create_user_id")
    private Integer createUserId;
    private Long createUserId;


    @Override

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/CustomConfig.java

File was renamed from ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/pojo/config/CustomeConfig.java
@@ -1,16 +1,16 @@
package com.ruoyi.system.domain.pojo.config;

import com.baomidou.mybatisplus.annotation.IdType;
import java.util.Date;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.activerecord.Model;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;

import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.experimental.Accessors;

import java.io.Serializable;
import java.util.Date;

/**
 * <p>
@@ -23,8 +23,8 @@
@Data
@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("t_custome_config")
public class CustomeConfig extends Model<CustomeConfig> {
@TableName("t_custom_config")
public class CustomConfig extends Model<CustomConfig> {

    private static final long serialVersionUID = 1L;


 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/listener/RedisListener.java

@@ -13,6 +13,13 @@

import java.util.Date;

/**
 * @author jqs34
 * @ClassName RedisListener
 * @description: redis监听
 * @date 2023年06月06日
 * @version: 1.0
 */
@Slf4j
@Component
public class RedisListener extends KeyExpirationEventMessageListener {

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/CustomConfigMapper.java

New file
@@ -0,0 +1,25 @@
package com.ruoyi.system.mapper.config;

import com.ruoyi.system.domain.pojo.config.CustomConfig;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import io.lettuce.core.dynamic.annotation.Param;

/**
 * <p>
 * 系统配置 Mapper 接口
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
public interface CustomConfigMapper extends BaseMapper<CustomConfig> {

    /**
     * @description  通过key获取系统自定义配置
     * @author  jqs
     * @date    2023/6/6 11:55
     * @param key
     * @return  CustomConfig
     */
    CustomConfig getByKey(@Param("key") String key);
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/mapper/config/CustomeConfigMapper.java

File was deleted

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CooperationService.java

@@ -1,5 +1,6 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.dto.MgtCooperationEditDto;
import com.ruoyi.system.domain.pojo.config.Cooperation;
import com.baomidou.mybatisplus.extension.service.IService;

@@ -13,4 +14,12 @@
 */
public interface CooperationService extends IService<Cooperation> {

    /**
     * @description
     * @author  jqs
     * @date    2023/6/6 9:25
     * @param mgtCooperationEditDto
     * @return  void
     */
    void editCooperation(MgtCooperationEditDto mgtCooperationEditDto);
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomConfigService.java

New file
@@ -0,0 +1,37 @@
package com.ruoyi.system.service.config;

import com.ruoyi.system.domain.dto.MgtServiceMobileEditDto;
import com.ruoyi.system.domain.pojo.config.CustomConfig;
import com.baomidou.mybatisplus.extension.service.IService;

/**
 * <p>
 * 系统配置 服务类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
public interface CustomConfigService extends IService<CustomConfig> {

    /**
     * @description  通过key获取系统自定义配置
     * @author  jqs
     * @date    2023/6/6 11:55
     * @param key
     * @return  CustomConfig
     */
    CustomConfig getByKey(String key);


    /**
     * @description  修改客服号码
     * @author  jqs
     * @date    2023/6/6 11:53
     * @param mgtServiceMobileEditDto
     * @return  void
     */
    void editServiceMobile( MgtServiceMobileEditDto mgtServiceMobileEditDto);


}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/config/CustomeConfigService.java

File was deleted

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CooperationServiceImpl.java

@@ -1,10 +1,15 @@
package com.ruoyi.system.service.impl.config;

import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.domain.dto.MgtCooperationEditDto;
import com.ruoyi.system.domain.pojo.config.Cooperation;
import com.ruoyi.system.mapper.config.CooperationMapper;
import com.ruoyi.system.service.config.CooperationService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * <p>
@@ -17,4 +22,31 @@
@Service
public class CooperationServiceImpl extends ServiceImpl<CooperationMapper, Cooperation> implements CooperationService {

    @Resource
    private CooperationMapper cooperationMapper;

    /**
     * @description
     * @author  jqs
     * @date    2023/6/6 9:24
     * @param mgtCooperationEditDto
     * @return  void
     */
    @Override
    public void editCooperation(MgtCooperationEditDto mgtCooperationEditDto){
        //将旧的置为删除
        UpdateWrapper<Cooperation> updateWrapper = new UpdateWrapper<>();
        updateWrapper.lambda().eq(Cooperation::getDelFlag, 0).set(Cooperation::getDelFlag, 1);
        cooperationMapper.update(null, updateWrapper);
        //创建新的Cooperation
        Cooperation cooperation = new Cooperation();
        cooperation.setDelFlag(0);
        cooperation.setTopPicture(mgtCooperationEditDto.getCooperationPicture());
        cooperation.setCooperDetail(mgtCooperationEditDto.getCooperationDetail());
        cooperation.setCreateTime(new Date());
        cooperation.setCreateUserId(mgtCooperationEditDto.getUserId());
        this.saveOrUpdate(cooperation);
    }


}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomConfigServiceImpl.java

New file
@@ -0,0 +1,66 @@
package com.ruoyi.system.service.impl.config;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.constant.ConfigEnum;
import com.ruoyi.system.domain.dto.MgtServiceMobileEditDto;
import com.ruoyi.system.domain.pojo.config.CustomConfig;
import com.ruoyi.system.mapper.config.CustomConfigMapper;
import com.ruoyi.system.service.config.CustomConfigService;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;

/**
 * <p>
 * 系统配置 服务实现类
 * </p>
 *
 * @author jqs
 * @since 2023-04-25
 */
@Service
public class CustomConfigServiceImpl extends ServiceImpl<CustomConfigMapper, CustomConfig> implements CustomConfigService {

    @Resource
    private CustomConfigMapper customConfigMapper;

    /**
     * @description  通过key获取系统自定义配置
     * @author  jqs
     * @date    2023/6/6 11:55
     * @param key
     * @return  CustomConfig
     */
    @Override
    public CustomConfig getByKey(String key){
        return customConfigMapper.getByKey(key);
    }


    /**
     * @description  修改客服号码
     * @author  jqs
     * @date    2023/6/6 11:53
     * @param mgtServiceMobileEditDto
     * @return  void
     */
    @Override
    public void editServiceMobile(MgtServiceMobileEditDto mgtServiceMobileEditDto) {
        // 获取平台服务电话的配置
        CustomConfig customConfig = getByKey(ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
        // 如果配置不存在，则创建一个新的配置
        if (customConfig == null) {
            customConfig = new CustomConfig();
            customConfig.setCreateTime(new Date());
        }
        // 设置配置的类型、键、名称、值和更新时间
        customConfig.setType(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyType());
        customConfig.setKey(ConfigEnum.PLATFORM_SERVICE_PHONE.getKey());
        customConfig.setName(ConfigEnum.PLATFORM_SERVICE_PHONE.getKeyName());
        customConfig.setValue(mgtServiceMobileEditDto.getServiceMobile());
        customConfig.setUpdateTime(new Date());
        // 保存或更新配置
        this.saveOrUpdate(customConfig);
    }
}

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/CustomeConfigServiceImpl.java

File was deleted

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/RecommendCooperationServiceImpl.java

@@ -3,7 +3,6 @@

import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.utils.DateUtils;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.system.domain.dto.MerRecommendCooperationDto;
import com.ruoyi.system.domain.dto.MerShopRecommendPageDto;
@@ -54,7 +53,7 @@
        recommendCooperation.setRecommendUserId(merRecommendCooperationDto.getUserId());
        recommendCooperation.setShopId(merRecommendCooperationDto.getShopId());
        recommendCooperation.setCorpStatus(1);
        recommendCooperation.setCreateTime(DateUtils.getNowDate());
        recommendCooperation.setCreateTime(new Date());
        this.save(recommendCooperation);
    }
}

 ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CustomConfigMapper.xml

File was renamed from ruoyi-modules/ruoyi-system/src/main/resources/mapper/config/CustomeConfigMapper.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.system.mapper.config.CustomeConfigMapper">
<mapper namespace="com.ruoyi.system.mapper.config.CustomConfigMapper">

    <resultMap type="CustomeConfig" id="CustomeConfigResult">
    <resultMap type="CustomConfig" id="CustomConfigResult">
        <result property="id"    column="id"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="type"    column="type"    />
@@ -13,12 +13,12 @@
        <result property="updateTime"    column="update_time"    />
    </resultMap>

    <sql id="selectCustomeConfigVo">
        select id, del_flag, type, key, name, value, create_time, update_time from t_custome_config
    <sql id="selectCustomConfigVo">
        select id, del_flag, type, key, name, value, create_time, update_time from t_custom_config
    </sql>

    <select id="selectCustomeConfigList" parameterType="CustomeConfig" resultMap="CustomeConfigResult">
        <include refid="selectCustomeConfigVo"/>
    <select id="selectCustomConfigList" parameterType="CustomConfig" resultMap="CustomConfigResult">
        <include refid="selectCustomConfigVo"/>
        <where>
            <if test="type != null "> and type = #{type}</if>
            <if test="key != null  and key != ''"> and key = #{key}</if>
@@ -27,13 +27,13 @@
        </where>
    </select>

    <select id="selectCustomeConfigById" parameterType="Long" resultMap="CustomeConfigResult">
        <include refid="selectCustomeConfigVo"/>
    <select id="selectCustomConfigById" parameterType="Long" resultMap="CustomConfigResult">
        <include refid="selectCustomConfigVo"/>
        where id = #{id}
    </select>

    <insert id="insertCustomeConfig" parameterType="CustomeConfig" useGeneratedKeys="true" keyProperty="id">
        insert into t_custome_config
    <insert id="insertCustomConfig" parameterType="CustomConfig" useGeneratedKeys="true" keyProperty="id">
        insert into t_custom_config
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
            <if test="type != null">type,</if>
@@ -54,8 +54,8 @@
        </trim>
    </insert>

    <update id="updateCustomeConfig" parameterType="CustomeConfig">
        update t_custome_config
    <update id="updateCustomConfig" parameterType="CustomConfig">
        update t_custom_config
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>
            <if test="type != null">type = #{type},</if>
@@ -68,15 +68,19 @@
        where id = #{id}
    </update>

    <delete id="deleteCustomeConfigById" parameterType="Long">
        delete from t_custome_config where id = #{id}
    <delete id="deleteCustomConfigById" parameterType="Long">
        delete from t_custom_config where id = #{id}
    </delete>

    <delete id="deleteCustomeConfigByIds" parameterType="String">
        delete from t_custome_config where id in
    <delete id="deleteCustomConfigByIds" parameterType="String">
        delete from t_custom_config where id in
        <foreach item="id" collection="array" open="(" separator="," close=")">
            #{id}
        </foreach>
    </delete>

    <select id="getByKey" resultMap="CustomConfigResult">
        <include refid="selectCustomConfigVo"/>
        WHERE del_flag = 0 AND key = #{key}
    </select>
</mapper>