java/qijisheng.git

			@@ -16,6 +16,7 @@
			import com.ruoyi.account.api.model.*;
			import com.ruoyi.account.dto.DangerInfoDto;
			import com.ruoyi.account.service.*;
			import com.ruoyi.account.util.OssUploadUtil;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.utils.bean.BeanUtils;
			import com.ruoyi.common.core.web.domain.AjaxResult;
			@@ -34,6 +35,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 +47,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>
			@@ -692,6 +695,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 +707,22 @@

			return R.ok(commissionDetail);
			}





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