修改bug

liujie

2023-10-26 e030255c23c7ba3e2cbad1036a810d6d72fa864f

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCouponController.java

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

import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.dsh.course.feignClient.account.AppUserClient;
import com.dsh.course.feignClient.account.CityManagerClient;
@@ -18,12 +19,10 @@
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
import com.dsh.guns.modular.system.model.CouponDataVo;
import com.dsh.guns.modular.system.model.Region;
import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.IRegionService;
import com.dsh.guns.modular.system.service.IStoreService;
import com.dsh.guns.modular.system.model.*;
import com.dsh.guns.modular.system.service.*;
import com.dsh.guns.modular.system.util.OBSUploadUtil;
import com.dsh.guns.modular.system.util.OssUploadUtil;
import com.dsh.guns.modular.system.util.ResultUtil;
import org.apache.commons.beanutils.ConvertUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -47,10 +46,7 @@
@RequestMapping("/tCouponManage")
public class TCouponController {



    private String PREFIX = "/system/tCoupon/";


    @Resource
    private IRegionService regiService;
@@ -66,8 +62,12 @@

    @Autowired
    private AppUserClient appUserClient;


    @Autowired
    private IUserService userService;
    @Autowired
    private TOperatorService operatorService;
    @Autowired
    private TOperatorCityService operatorCityService;

    /**
     * 跳转到优惠券管理首页
@@ -85,9 +85,8 @@
        Integer objectType = UserExt.getUser().getObjectType();
        System.out.println(objectType);
        model.addAttribute("userType",objectType);
        return PREFIX + "TQuestionAdd.html";
        return PREFIX + "TCouponAdd.html";
    }


    @RequestMapping("/coupon_record/{id}")
    public String memberCouponAdd(@PathVariable Integer id,Model model) {
@@ -163,7 +162,7 @@
     */
    @RequestMapping("/storeList")
    public String storePage(Model model) {
        return PREFIX + "TQuestionEdit.html";
        return PREFIX + "TStoreList.html";
    }
    @RequestMapping("/updateType")
    @ResponseBody
@@ -174,33 +173,29 @@

    @RequestMapping("/storeDetailsOfSearch")
    @ResponseBody
    public Object listOfStore(Integer provinceId,Integer cityId,Integer cityManagerId,String storeName){
        System.out.println("provinceId"+provinceId);
        System.out.println("cityId"+cityId);
        System.out.println("cityManagerId"+cityManagerId);
        System.out.println("storeName"+storeName);
        String provinceCode = null;
        String cityCode = null;
        if (ToolUtil.isNotEmpty(provinceId)){
            Region provinceRegion = regiService.getById(provinceId);
            provinceCode = provinceRegion.getCode();
        }
        if (ToolUtil.isNotEmpty(cityId)){
            Region cityRegion = regiService.getById(cityId);
            cityCode = cityRegion.getCode();
        }
    public Object listOfStore(String provinceId,String cityId,Integer operatorId,String storeName){


        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceCode,cityCode,cityManagerId,storeName,page);
        List<Map<String,Object>> storeList = storeService.queryListOfpage(provinceId,cityId,operatorId,storeName,page);
        if (storeList.size() > 0 ){
            for (Map<String, Object> stringObjectMap : storeList) {
                String provinceName = (String) stringObjectMap.get("province");
                String cityName = (String) stringObjectMap.get("city");
                stringObjectMap.put("provinceCity",provinceName+cityName);
                Integer managerId = (Integer) stringObjectMap.get("cityManagerId");
                CityManager cityManager = cmgrClient.queryCityManagerById(managerId);
                if (ToolUtil.isNotEmpty(cityManager)){
                    stringObjectMap.put("accountName",cityManager.getName()+"+"+cityManager.getPhone());
                Integer managerId = (Integer) stringObjectMap.get("operatorId");
                if (managerId==0){
                    stringObjectMap.put("accountName","平台");
                }else{
                    TOperator operator = operatorService.getOne(new QueryWrapper<TOperator>().eq("id", managerId));
                    if (ToolUtil.isNotEmpty(operator)){
                        stringObjectMap.put("accountName",operator.getName());
                    }else{
                        stringObjectMap.put("accountName","平台");

                    }
                }

            }
        }
        return storeList;
@@ -221,8 +216,37 @@
        ofSearch.setUserPopulation(userPopulation);
        ofSearch.setStatus(status);
        ofSearch.setState(state);
        if (UserExt.getUser().getObjectType()==3) {
            ofSearch.setStoreId(UserExt.getUser().getObjectId());
            ofSearch.setObjType(UserExt.getUser().getObjectType());
        }


        return client.getCouponListOfSearch(ofSearch);
    }

    /**
     * 获取 优惠券管理
     */
    @RequestMapping(value = "/list1")
    @ResponseBody
    public Object listOfDatas1(String name, Integer type, Integer distributionMethod , Integer userPopulation, Integer status, Integer state,String cityCode,Integer storeId) {
        Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
        CouponListOfSearch ofSearch = new CouponListOfSearch();
        ofSearch.setPage(page);
        ofSearch.setName(name);
        ofSearch.setType(type);
        ofSearch.setDistributionMethod(distributionMethod);
        ofSearch.setUserPopulation(userPopulation);
        ofSearch.setStatus(status);
        ofSearch.setState(state);
        ofSearch.setCityCode(cityCode);
        ofSearch.setStoreId(storeId);
        return client.getCouponListOfSearch1(ofSearch);
    }



    @RequestMapping(value = "/listRecord")
    @ResponseBody
    public Object listRecord(Integer id,String name, Integer type, String phone) {
@@ -273,6 +297,18 @@
        return regiService.list(new LambdaQueryWrapper<Region>()
                .eq(Region::getParentId,province));
    }
    // 通过市 获取运营商
    @RequestMapping(value = "/getOperator")
    @ResponseBody
    public Object getOperator(String city){
        List<TOperatorCity> name = operatorCityService.list(new QueryWrapper<TOperatorCity>().eq("name", city));
        List<Integer> collect = name.stream().map(TOperatorCity::getOperatorId)
                .collect(Collectors.toList());
        if (collect.size()==0){
            return new ArrayList<>();
        }
        return operatorService.list(new QueryWrapper<TOperator>().in("id",collect));
    }

    @RequestMapping(value = "/uploadPic")
    @ResponseBody
@@ -280,7 +316,7 @@
        if (imgFile != null){
        String originalFilename = imgFile.getOriginalFilename();
        String newName = originalFilename.substring(imgFile.getOriginalFilename().lastIndexOf("."));
        String url = OBSUploadUtil.inputStreamUpload(imgFile);
        String url = OssUploadUtil.ossUpload("img/",imgFile);
        Map<String, String> map = new HashMap<String, String>();
        //是否上传成功
        map.put("state", "SUCCESS");
@@ -309,9 +345,16 @@
        System.out.println(dataVo);
        Integer objectType = UserExt.getUser().getObjectType();
        dataVo.setUserType(objectType);
        if(UserExt.getUser().getObjectType()==3){
            dataVo.setStoreIds(UserExt.getUser().getObjectId().toString());
            dataVo.setCompany(3);
        }
        dataVo.setObjType(UserExt.getUser().getObjectType());
        client.insertIntoData(dataVo);
        return new SuccessTip<>();
    }


    @PostMapping(value = "/update")
    @ResponseBody
    public Object update( Integer id,Integer num,Integer num1,String text){
@@ -319,6 +362,9 @@
        coupon.setQuantityIssued(num);
        coupon.setPickUpQuantity(num1);
        coupon.setIllustrate(text);
        if (UserExt.getUser().getObjectType()==3) {
            coupon.setAuditStatus(1);
        }
        client.updateCouponData(coupon);
        return new SuccessTip<>();
    }