合并代码

puzhibing

2024-12-26 e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5

 ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/AppUserController.java

@@ -16,9 +16,9 @@
import com.ruoyi.account.api.model.*;
import com.ruoyi.account.dto.DangerInfoDto;
import com.ruoyi.account.service.*;
import com.ruoyi.account.util.ObsUploadUtil;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.order.feignClient.RemoteOrderGoodsClient;
import com.ruoyi.order.model.Order;
@@ -34,6 +34,7 @@
import org.springframework.web.bind.annotation.RestController;

import javax.annotation.Resource;
import java.io.IOException;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@@ -45,6 +46,7 @@
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.page.TableDataInfo;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

/**
 * <p>
@@ -396,7 +398,7 @@

    @GetMapping("/shop/getAppuserPage")
    @ApiOperation(value = "用户列表", tags = {"门店后台"})
    public R<IPage<AppUser>> shopGetAppuserPage(@ApiParam("页码") @RequestParam Integer pageNum,
    public R<IPage<AppUser>> shopGetAppuserPage(@ApiParam("页码") @RequestParam Integer pageCurr,
                                                @ApiParam("每一页数据大小") Integer pageSize,
                                                AppUser appUser) {
        Integer objectId = tokenService.getLoginUser().getSysUser().getObjectId();
@@ -408,7 +410,7 @@
        for (Order datum : listR.getData()) {
            userIds.add(datum.getAppUserId());
        }
        IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageNum, pageSize, appUser, objectId, userIds);
        IPage<AppUser> appuserPage = appUserService.getAppuserPage1(pageCurr, pageSize, appUser, objectId, userIds);
        return R.ok(appuserPage);
    }

@@ -494,7 +496,7 @@

    @GetMapping("/change/shop")
    @ApiOperation(value = "用户列表-更换门店", tags = {"管理后台"})
    public R<AppUser> shop(Long id, Long shopId) {
    public R<AppUser> shop(Long id, Integer shopId) {
        AppUser byId = appUserService.getById(id);
        byId.setShopId(shopId);
        appUserService.updateById(byId);
@@ -692,6 +694,10 @@
                    BigDecimal add = commissionDate.getNormalCommission().add(commissionDate.getGoldCommission()).add(commissionDate.getDiamondCommission()).add(commissionDate.getAgentCommission())
                            .add(commissionDate.getSuperAgentCommission()).add(commissionDate.getTopAgentCommission()).add(commissionDate.getPartnerCommission());
                    commissionDate.setTotalCommission(add);
                    
//                    commissionDate.setServiceChargeCommission();
//                    commissionDate.setAssociatedUserCommission();
//                    commissionDate.setBindLowerLevelStoresCommission();
                    return commissionDate;
                })
                .collect(Collectors.toList());
@@ -700,8 +706,22 @@

        return R.ok(commissionDetail);
    }



    
    
    /**
     * 上传图片
     * @param file
     * @return
     */
    @PostMapping("/upload")
    public String upload(MultipartFile file){
        String s = null;
        try {
            s = ObsUploadUtil.obsUpload(file);
        } catch (IOException e) {
            throw new RuntimeException(e);
        }
        return s;
    }
}