bug修改

无关风月

1 天以前 9d6848ea3b085d66f515403d1991ed492d4bc395

bug修改

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -738,8 +738,8 @@
     * @param cityCode 城市code
     * @return
     */
    @PostMapping("/appUser/getAppUserIds")
    public List<Integer> getAppUserIds(@RequestBody String cityCode){
    @GetMapping("/appUser/getAppUserIds/{cityCode}")
    public List<Integer> getAppUserIds(@PathVariable("cityCode") String cityCode){
        List<TAppUser> list = appUserService.list(new QueryWrapper<TAppUser>().eq("cityCode", cityCode).eq("state", 1));
        return list.stream().map(TAppUser::getId).collect(Collectors.toList());
    }

 cloud-server-activity/src/main/resources/mapper/PayHuiminMapper.xml

@@ -120,7 +120,7 @@
        tph.id,
        thc.huiMinName,
        thc.huiMinType,
        thc.salesMoney,
        tph.salesMoney,
        thc.operatorId,
        thc.storeIds,
        tph.appUserId,

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/controller/WorldCupController.java

@@ -1260,7 +1260,7 @@
                    Date birthday = appUser.getBirthday();
                    LocalDate now = LocalDate.now();
                    if(birthday!=null){
                        int age = now.getYear() - birthday.getYear();
                        int age = now.getYear() - (birthday.getYear()+1900);
                        worldCupUserListVo.setAge(age);
                    }
                    worldCupUserListVos.add(worldCupUserListVo);

 cloud-server-communityWorldCup/src/main/java/com/dsh/communityWorldCup/feignclient/account/AppUserClient.java

@@ -5,6 +5,8 @@
import com.dsh.communityWorldCup.feignclient.account.model.TStudent;
import com.dsh.communityWorldCup.model.UserDetailsOfSearch;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping;

import java.util.List;
@@ -47,8 +49,8 @@
     * @param cityCode 城市code
     * @return
     */
    @PostMapping("/appUser/getAppUserIds")
    List<Integer> getAppUserIds(String cityCode);
    @GetMapping("/appUser/getAppUserIds/{cityCode}")
    List<Integer> getAppUserIds(@PathVariable("cityCode")String cityCode);


    /**

 cloud-server-management/src/main/resources/mapper/TStoreMapper.xml

@@ -218,7 +218,7 @@
        ,t2.type as `type`
        from t_site t1
        left join t_store t2 on t1.storeId =t2.id
        where t1.state=1 and t2.state=1 and t1.isCanBeBooked = 0 and t1.reservation=0
        where t1.state=1 and t2.state=1
        <if test="provinceCode != null and provinceCode!=''">
            and t1.provinceCode = #{provinceCode}
        </if>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_edit.html

@@ -216,7 +216,7 @@
                if (file && file.response) {
                    file.url = file.response;
                }
                TCarInfoDlg.goodsPicArray.push(res);
                TCarInfoDlg.goodsPicArray.push(file.url);
                console.log(TCarInfoDlg.goodsPicArray);
            },
            // 添加 beforeUpload 钩子到 el-upload 组件