小程序初步完成

jiangqs

2023-05-03 00f3a60a31dd5f6bcc4a02f03beb15d91cd4b6f8

小程序初步完成

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/RemoteUserService.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api;

import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.springframework.cloud.openfeign.FeignClient;
@@ -83,4 +84,7 @@
     */
    @PostMapping("/user/editUserInfo")
    public R editUserInfo(@RequestBody AppEditUserDto appEditUserDto);

    @PostMapping("/config/getSysTag")
    public R<SysTag> getSysTag(@RequestBody Long sysTagId);
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteUserFallbackFactory.java

@@ -1,6 +1,7 @@
package com.ruoyi.system.api.factory;

import com.ruoyi.system.api.domain.dto.AppEditUserDto;
import com.ruoyi.system.api.domain.poji.config.SysTag;
import com.ruoyi.system.api.model.AppMiniLoginDto;
import com.ruoyi.system.api.model.AppMiniLoginVo;
import org.slf4j.Logger;
@@ -59,6 +60,11 @@
            public R editUserInfo(AppEditUserDto appEditUserDto) {
                return R.fail("更新用户信息失败:" + throwable.getMessage());
            }

            @Override
            public R<SysTag> getSysTag(Long sysTagId) {
                return null;
            }
        };
    }
}

 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/controller/console/ShopController.java

@@ -11,6 +11,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;

/**
 * @author jqs34
 * @ClassName ShopController
@@ -22,7 +24,7 @@
@RequestMapping("/shop")
public class ShopController {

    @Autowired
    @Resource
    private ShopService shopService;

    @InnerAuth

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

@@ -51,8 +51,8 @@
    @Resource
    private ShopCertificateService shopCertificateService;

    @Resource
    private RemoteConfigService configService;
    /*@Resource
    private RemoteConfigService configService;*/

    @Resource
    private RemoteUserService sysUserService;
@@ -138,12 +138,12 @@
            for(String str : shopTagIdArray){
                shopRelTag = new ShopRelTag();
                tagid = Long.valueOf(str);
                sysTag = configService.getSysTag(tagid).getData();
                //sysTag = configService.getSysTag(tagid).getData();
                shopRelTag.setDelFlag(0);
                shopRelTag.setShopId(shop.getShopId());
                shopRelTag.setTagId(tagid);
                shopRelTagService.save(shopRelTag);
                shopTagSj.add(sysTag.getTagName());
                //shopTagSj.add(sysTag.getTagName());
            }
            shop.setShopTags(shopTagSj.toString());
            this.saveOrUpdate(shop);
@@ -303,7 +303,7 @@
            StringJoiner shopTagSj = new StringJoiner(",");
            for(String str : shopTagIdArray){
                tagId = Long.valueOf(str);
                sysTag = configService.getSysTag(tagId).getData();
                sysTag = sysUserService.getSysTag(tagId).getData();
                shopRelTag = new ShopRelTag();
                shopRelTag.setDelFlag(0);
                shopRelTag.setShopId(shopId);

 ruoyi-modules/ruoyi-shop/src/main/resources/mapper/shop/ShopMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.shop.mapper.shop.ShopMapper">

    <resultMap type="Shop" id="ShopResult">
    <resultMap type="com.ruoyi.system.api.domain.poji.shop.Shop" id="ShopResult">
        <result property="shopId"    column="shop_id"    />
        <result property="delFlag"    column="del_flag"    />
        <result property="shopStatus"    column="shop_status"    />
@@ -57,7 +57,7 @@
        select shop_id, del_flag, shop_status, create_time, create_user_id, update_time, update_user_id, shop_name, shop_number, shop_type, business_start_time, business_end_time, shopowner_name, shopowner_phone, sign_time, sign_province_code, sign_city_code, sign_area_code, sign_area_name, shop_service_phone, belong_user_id, belong_shop_id, supporting_capacity_flag, operation_person_flag, executive_force_flag, pattern_flag, connection_flag, economic_ability_flag, relation_partner, business_history, shop_province_code, shop_city_code, shop_area_code, shop_area_name, shop_address, shop_longitude, shop_latitude, shop_detail, marketing_function_flag, platform_coupon_flag, platform_birthday_flag, shop_custom_status, recommend_person, cooperation_end_time, cooperation_start_time, shop_tags, sign_user_id, shop_source from t_shop
    </sql>

    <select id="selectShopList" parameterType="Shop" resultMap="ShopResult">
    <select id="selectShopList" parameterType="com.ruoyi.system.api.domain.poji.shop.Shop" resultMap="ShopResult">
        <include refid="selectShopVo"/>
        <where>
            <if test="shopStatus != null "> and shop_status = #{shopStatus}</if>
@@ -112,7 +112,7 @@
        where shop_id = #{shopId}
    </select>

    <insert id="insertShop" parameterType="Shop" useGeneratedKeys="true" keyProperty="shopId">
    <insert id="insertShop" parameterType="com.ruoyi.system.api.domain.poji.shop.Shop" useGeneratedKeys="true" keyProperty="shopId">
        insert into t_shop
        <trim prefix="(" suffix=")" suffixOverrides=",">
            <if test="delFlag != null">del_flag,</if>
@@ -214,7 +214,7 @@
        </trim>
    </insert>

    <update id="updateShop" parameterType="Shop">
    <update id="updateShop" parameterType="com.ruoyi.system.api.domain.poji.shop.Shop">
        update t_shop
        <trim prefix="SET" suffixOverrides=",">
            <if test="delFlag != null">del_flag = #{delFlag},</if>

 ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/conslole/ConfigController.java

@@ -7,6 +7,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

/**
 * @author jqs34
 * @version 1.0
@@ -18,7 +20,7 @@
@RequestMapping("/config")
public class ConfigController {

    @Autowired
    @Resource
    private SysTagService sysTagService;

    @InnerAuth