代码异味修复-2025-03-22

fs-user-app/src/main/java/com/fs/app/constant/CommonConstant.java

@@ -0,0 +1,13 @@
+package com.fs.app.constant;
+
+/**
+ * 通用常量
+ */
+public class CommonConstant {
+
+    private CommonConstant(){}
+    /**
+     * 销售登录token
+     */
+    public static final String REDIS_KEY_COMPANY_USER_TOKEN = "company-user-token:";
+}

fs-user-app/src/main/java/com/fs/app/controller/AppBaseController.java

@@ -1,46 +1,22 @@
 package com.fs.app.controller;
 
 
-import com.fs.app.annotation.Login;
 import com.fs.app.utils.JwtUtils;
-import com.fs.common.config.FSConfig;
-import com.fs.common.core.domain.AjaxResult;
-import com.fs.common.core.domain.R;
-import com.fs.common.core.domain.entity.SysUser;
 import com.fs.common.core.redis.RedisCache;
 import com.fs.common.utils.ServletUtils;
 import com.fs.common.utils.StringUtils;
-import com.fs.common.utils.file.FileUploadUtils;
-import com.fs.core.config.ServerConfig;
-import com.fs.crm.domain.CrmEvent;
-import com.fs.crm.service.ICrmCustomerService;
-import com.fs.crm.service.ICrmCustomerUserService;
-import com.fs.crm.service.ICrmEventService;
-import com.fs.crm.service.ICrmMsgService;
-import com.fs.system.service.ISysConfigService;
-import com.fs.system.service.ISysDictDataService;
-import com.fs.system.service.ISysUserService;
-import com.fs.system.vo.DictVO;
-import com.fs.voice.service.IVoiceService;
-import com.github.xiaoymin.swaggerbootstrapui.util.CommonUtils;
 import io.jsonwebtoken.Claims;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-
 
+/**
+ * 基类控制器
+ * 集成jwt redis
+ */
 public class AppBaseController {
 	@Autowired
-	JwtUtils jwtUtils;
+	protected JwtUtils jwtUtils;
 	@Autowired
-	RedisCache redisCache;
+	protected RedisCache redisCache;
 
 	public String getUserId()
 	{
@@ -48,19 +24,14 @@ public class AppBaseController {
 		if(StringUtils.isNotEmpty(headValue)){
 			Claims claims=jwtUtils.getClaimByToken(headValue);
 			if(StringUtils.isNotEmpty(claims)){
-				String userId = claims.getSubject().toString();
-				return userId;
+				return claims.getSubject();
 			}
 			else{
 				return null;
 			}
-
 		}
 		else{
 			return null;
 		}
-
 	}
-
-
 }

fs-user-app/src/main/java/com/fs/app/controller/CompanyOrderController.java

@@ -11,7 +11,6 @@ import com.fs.store.service.IFsStoreOrderService;
 import com.fs.store.service.IFsStoreOrderStatusService;
 import com.fs.store.service.IFsStoreProductService;
 import com.fs.store.vo.FsStoreProductListQueryVO;
-import com.fs.system.service.ISysConfigService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -20,10 +19,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.List;
 
+import static com.fs.app.constant.CommonConstant.REDIS_KEY_COMPANY_USER_TOKEN;
+
 
 @Api("销售订单")
 @RestController
@@ -37,12 +37,10 @@ public class CompanyOrderController extends  AppBaseController {
     private IFsStoreProductService productService;
     @Autowired
     private IFsStoreOrderStatusService orderStatusService;
-    @Autowired
-    private ISysConfigService configService;
 
     @ApiOperation("获取商品列表")
     @GetMapping("/getSalesProducts")
-    public R getSalesProducts(FsStoreProductQueryParam param, HttpServletRequest request){
+    public R getSalesProducts(FsStoreProductQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setIsDisplay(0);
         List<FsStoreProductListQueryVO> productList=productService.selectFsStoreProductListQuery(param);
@@ -53,8 +51,8 @@ public class CompanyOrderController extends  AppBaseController {
     @Login
     @ApiOperation("制单")
     @GetMapping("/createSalesOrder")
-    public R createSalesOrder(@RequestParam("token")String token,@RequestParam("cateIds")String cateIds, HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+    public R createSalesOrder(@RequestParam("token")String token,@RequestParam("cateIds")String cateIds){
+        Long userId=redisCache.getCacheObject(REDIS_KEY_COMPANY_USER_TOKEN+token);
         if(userId==null){
             return R.error(403,"用户失效");
         }
@@ -70,8 +68,8 @@ public class CompanyOrderController extends  AppBaseController {
 
     @ApiOperation("改价")
     @GetMapping("/updateSalseOrderMoney")
-    public R updateSalseOrderMoney(@RequestParam("token")String token,@RequestParam("createOrderKey")String createOrderKey, @RequestParam("money") BigDecimal money, HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+    public R updateSalesOrderMoney(@RequestParam("token")String token,@RequestParam("createOrderKey")String createOrderKey, @RequestParam("money") BigDecimal money){
+        Long userId=redisCache.getCacheObject(REDIS_KEY_COMPANY_USER_TOKEN+token);
         if(userId==null){
             return R.error(403,"用户失效");
         }
@@ -81,13 +79,13 @@ public class CompanyOrderController extends  AppBaseController {
 
     @ApiOperation("获取订单")
     @GetMapping("/getSalesOrder")
-    public R getSalesOrder(@RequestParam("createOrderKey")String createOrderKey, HttpServletRequest request){
+    public R getSalesOrder(@RequestParam("createOrderKey")String createOrderKey){
         return orderService.getSalesOrder(createOrderKey);
     }
     @Login
     @ApiOperation("添加用户购物车")
     @GetMapping("/addUserCart")
-    public R addUserCart(@RequestParam("createOrderKey")String createOrderKey, HttpServletRequest request){
+    public R addUserCart(@RequestParam("createOrderKey")String createOrderKey){
         return orderService.addUserCart(Long.parseLong(getUserId()),createOrderKey);
     }
 
@@ -95,8 +93,8 @@ public class CompanyOrderController extends  AppBaseController {
     @ApiOperation("改订单价格")
     @GetMapping("/editOrderMoney")
     @Transactional
-    public R editOrderMoney(@RequestParam("token")String token,@RequestParam("orderId")Long orderId, @RequestParam("money") BigDecimal money, HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+    public R editOrderMoney(@RequestParam("token")String token,@RequestParam("orderId")Long orderId, @RequestParam("money") BigDecimal money){
+        Long userId=redisCache.getCacheObject(REDIS_KEY_COMPANY_USER_TOKEN+token);
         if(userId==null){
             return R.error(403,"用户失效");
         }

fs-user-app/src/main/java/com/fs/app/controller/CompanyUserController.java

@@ -7,8 +7,6 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
 import com.fs.app.annotation.Login;
 import com.fs.common.config.FSConfig;
 import com.fs.common.core.domain.R;
-import com.fs.common.core.redis.RedisCache;
-import com.fs.common.exception.CustomException;
 import com.fs.common.utils.sign.Md5Utils;
 import com.fs.company.domain.CompanyUser;
 import com.fs.company.domain.CompanyUserCard;
@@ -16,36 +14,36 @@ import com.fs.company.param.CompanyUserLoginParam;
 import com.fs.company.service.ICompanyUserCardService;
 import com.fs.company.service.ICompanyUserService;
 import com.fs.core.security.SecurityUtils;
-import com.fs.store.domain.FsUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
+import org.apache.http.util.Asserts;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
-import java.awt.*;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.util.concurrent.TimeUnit;
 
+import static com.fs.app.constant.CommonConstant.REDIS_KEY_COMPANY_USER_TOKEN;
+
 
 @Api("销售中心")
 @RestController
 @RequestMapping(value="/app/companyUser")
-public class CompanyUserController extends  AppBaseController {
+@Slf4j
+public class CompanyUserController extends AppBaseController {
 
     @Autowired
     private FSConfig fsConfig;
     @Autowired
-    RedisCache redisCache;
-    @Autowired
     private ICompanyUserService companyUserService;
     @Autowired
     private ICompanyUserCardService companyUserCardService;
+
     @PostMapping("/login")
-    public R Login(@RequestBody CompanyUserLoginParam param, HttpServletRequest request){
+    public R login(@RequestBody CompanyUserLoginParam param){
         try {
             CompanyUser companyUser=companyUserService.selectUserByUserName(param.getUserName());
             if(companyUser==null||companyUser.getDelFlag().equals("1")){
@@ -55,22 +53,20 @@ public class CompanyUserController extends  AppBaseController {
                 return R.error("用户已禁用");
 
             }
-            String pwd=SecurityUtils.encryptPassword(param.getPassword());
             if(!SecurityUtils.matchesPassword(param.getPassword(),companyUser.getPassword())){
                 return R.error("密码不正确");
             }
-            redisCache.setCacheObject("company-user-token:"+Md5Utils.hash(companyUser.getUserId().toString()),companyUser.getUserId(),5, TimeUnit.DAYS);
+            redisCache.setCacheObject(REDIS_KEY_COMPANY_USER_TOKEN+Md5Utils.hash(companyUser.getUserId().toString()),companyUser.getUserId(),5, TimeUnit.DAYS);
             return R.ok().put("companyUserToken", Md5Utils.hash(companyUser.getUserId().toString()));
         } catch (Exception e){
-
             return R.error("操作异常");
         }
     }
 
     @ApiOperation("获取销售信息")
     @GetMapping("/getUserInfo")
-    public R getUserInfo(@RequestParam("token")String token, HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+    public R getUserInfo(@RequestParam("token")String token){
+        Long userId=redisCache.getCacheObject(REDIS_KEY_COMPANY_USER_TOKEN+token);
         if(userId==null){
             return R.error(403,"用户失效");
         }
@@ -86,7 +82,7 @@ public class CompanyUserController extends  AppBaseController {
 
     @ApiOperation("获取销售名片")
     @GetMapping("/getCompanyUserCard")
-    public R getCompanyUserCard(@RequestParam("cardId")Long cardId,HttpServletRequest request){
+    public R getCompanyUserCard(@RequestParam("cardId")Long cardId){
         //获取用户码
         CompanyUserCard companyUserCard=companyUserCardService.selectCompanyUserCardById(cardId);
         return R.ok().put("data",companyUserCard);
@@ -95,81 +91,46 @@ public class CompanyUserController extends  AppBaseController {
     @Login
     @ApiOperation("获取支付宝收款码")
     @GetMapping("/getQrImg")
-    public R getQrImg(@RequestParam("token")String token,HttpServletRequest request){
-        Long userId=redisCache.getCacheObject("company-user-token:"+token);
+    public R getQrImg(@RequestParam("token")String token){
+        Long userId=redisCache.getCacheObject(REDIS_KEY_COMPANY_USER_TOKEN + token);
         try {
             CompanyUser companyUser=companyUserService.selectCompanyUserById(userId);
             File newFile = new File("qr.jpg");
             File newFileT = new File("simsunb.ttf");
-            try {
-                InputStream stream =  getClass().getClassLoader().getResourceAsStream("qr.jpg");
-                FileUtils.copyInputStreamToFile(stream, newFile);
-                // if(!newFile.exists()){
-                //     InputStream stream =  getClass().getClassLoader().getResourceAsStream("fx.jpg");
-                //     FileUtils.copyInputStreamToFile(stream, newFile);
-                // }
-                if(!newFileT.exists()){
-                    InputStream streamT =  getClass().getClassLoader()
-                            .getResourceAsStream("simsunb.ttf");
-                    FileUtils.copyInputStreamToFile(streamT, newFileT);
-                }
-            } catch (IOException e) {
-
-                throw new CustomException(e.getMessage());
+            InputStream stream =  getClass().getClassLoader().getResourceAsStream("qr.jpg");
+
+            Asserts.notNull(stream,"收款码不存在!");
+
+            FileUtils.copyInputStreamToFile(stream, newFile);
+            if(!newFileT.exists()){
+                InputStream streamT =  getClass().getClassLoader()
+                        .getResourceAsStream("simsunb.ttf");
+                Asserts.notNull(streamT,"字体文件不存在!");
+                FileUtils.copyInputStreamToFile(streamT, newFileT);
             }
 
-            try {
-                String url=fsConfig.getQrPath()+"/qr-"+userId+".jpg";
-                File outputFile = new File(url);
-                if(!outputFile.exists())
-                {
-                    try {
-                        outputFile.createNewFile();
-
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-//                Font font =  Font.createFont(Font.TRUETYPE_FONT, newFileT);
-//                Font f= font.deriveFont(Font.PLAIN,20);
-//                ImgUtil.pressText(//
-//                        newFile,
-//                        outputFile,
-//                        companyUser.getNickName()+" 为您服务",
-//                        Color.BLACK,
-//                        f, //字体
-//                        65, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
-//                        100, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
-//                        0.8f//透明度：alpha 必须是范围 [0.0, 1.0] 之内（包含边界值）的一个浮点数字
-//                );
-                File qr = new File(fsConfig.getQrPath()+"/qr-"+userId+".png");
-                if(!qr.exists())
-                {
-                    try {
-                        qr.createNewFile();
-
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-                QrCodeUtil.generate( "http://alipay.yjf.runtzh.com/#/?companyId="+companyUser.getCompanyId()+"&companyUserId="+companyUser.getUserId(), 200, 200,
-                        FileUtil.file(fsConfig.getQrPath()+"/qr-"+userId+".png"));
-                ImgUtil.pressImage(
-                        newFile,
-                        outputFile,
-                        ImgUtil.read(qr), //QR图片
-                        0, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        20, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        1f
-                );
-                return R.ok().put("url","profile/qr/qr-"+userId+".jpg");
-
-            } catch (Exception e) {
-                e.printStackTrace();
-                return R.error("操作异常");
+            String url=fsConfig.getQrPath()+"/qr-"+userId+".jpg";
+            File outputFile = new File(url);
+            if(!outputFile.exists()) {
+                outputFile.createNewFile();
             }
+            File qr = new File(fsConfig.getQrPath()+"/qr-"+userId+".png");
+            if(!qr.exists()) {
+                qr.createNewFile();
+            }
+            QrCodeUtil.generate( "http://alipay.yjf.runtzh.com/#/?companyId="+companyUser.getCompanyId()+"&companyUserId="+companyUser.getUserId(), 200, 200,
+                    FileUtil.file(fsConfig.getQrPath()+"/qr-"+userId+".png"));
+            ImgUtil.pressImage(
+                    newFile,
+                    outputFile,
+                    ImgUtil.read(qr), //QR图片
+                    0, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    20, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    1f
+            );
+            return R.ok().put("url","profile/qr/qr-"+userId+".jpg");
         } catch (Exception e){
-
+            log.error("获取收款码异常", e);
             return R.error("操作异常");
         }
     }

fs-user-app/src/main/java/com/fs/app/controller/CouponController.java

@@ -28,21 +28,17 @@ import java.util.stream.Collectors;
 @Api("优惠券接口")
 @RestController
 @RequestMapping(value="/app/coupon")
-public class CouponController extends  AppBaseController {
+public class CouponController extends AppBaseController {
 
     @Autowired
     private IFsStoreCouponIssueService fsStoreCouponIssueService;
     @Autowired
-    private IFsStoreCouponService couponService;
-    @Autowired
     private IFsStoreCouponUserService fsStoreCouponUserService;
-    @Autowired
-    RedisCache redisCache;
 
     @Login
     @ApiOperation("获取优惠券列表")
     @GetMapping("/getCouponIssueList")
-    public R getCouponIssueList(BaseQueryParam param, HttpServletRequest request){
+    public R getCouponIssueList(BaseQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         try {
             FsStoreCouponIssue map=new FsStoreCouponIssue();
@@ -59,7 +55,7 @@ public class CouponController extends  AppBaseController {
     @Login
     @ApiOperation("获取我的优惠券列表")
     @GetMapping("/getMyCouponList")
-    public R getMyCouponList(FsCouponUserParam param, HttpServletRequest request){
+    public R getMyCouponList(){
         try {
             FsStoreCouponUser map=new FsStoreCouponUser();
             map.setIsDel(0);
@@ -74,7 +70,7 @@ public class CouponController extends  AppBaseController {
     @Login
     @ApiOperation("领取")
     @PostMapping("/receive")
-    public R receive(@RequestBody FsStoreCouponReceiveParam param, HttpServletRequest request){
+    public R receive(@RequestBody FsStoreCouponReceiveParam param){
         return fsStoreCouponIssueService.receive(getUserId(),param);
     }
 
@@ -82,7 +78,7 @@ public class CouponController extends  AppBaseController {
     @Login
     @ApiOperation("获取销售可用套餐卷列表")
     @GetMapping("/getCompanyCouponIssueList")
-    public R getCompanyCouponIssueList(FsCouponIssueParam param, HttpServletRequest request){
+    public R getCompanyCouponIssueList(FsCouponIssueParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         try {
             List<FsStoreCouponIssueVO> list=fsStoreCouponIssueService.getCompanyCouponIssueList(param);
@@ -93,12 +89,9 @@ public class CouponController extends  AppBaseController {
         }
     }
 
-
-
-
     @ApiOperation("获取销售可用套餐卷")
     @GetMapping("/getCouponIssueById")
-    public R getCouponIssueById(@RequestParam(value="id") Long id, HttpServletRequest request){
+    public R getCouponIssueById(@RequestParam(value="id") Long id){
         String code = IdUtil.getSnowflake(0, 0).nextIdStr();
         redisCache.setCacheObject("coupon:"+code,id.toString(),10, TimeUnit.MINUTES);
         FsStoreCouponIssueVO couponIssue=fsStoreCouponIssueService.selectFsStoreCouponIssueVOById(id);
@@ -108,7 +101,7 @@ public class CouponController extends  AppBaseController {
     @Login
     @ApiOperation("领取")
     @PostMapping("/companyReceive")
-    public R companyReceive(@RequestBody FsStoreCouponReceiveParam param, HttpServletRequest request){
+    public R companyReceive(@RequestBody FsStoreCouponReceiveParam param){
         String code=redisCache.getCacheObject("coupon:"+param.getCode());
         if(StringUtils.isEmpty(code)){
             return R.error("此券已失效");
@@ -120,12 +113,12 @@ public class CouponController extends  AppBaseController {
     @Login
     @ApiOperation("获取我的优惠券列表")
     @GetMapping("/getMyEnableCouponList")
-    public R getMyEnableCouponList(FsCouponUserEnableParam param, HttpServletRequest request){
+    public R getMyEnableCouponList(FsCouponUserEnableParam param){
         try {
             param.setUserId(Long.parseLong(getUserId()));
             List<FsStoreCouponUser> list=fsStoreCouponUserService.selectFsStoreCouponUserListByEnable(param);
-            list=list.stream().filter(s->(s.getCouponPrice().compareTo(param.getUseMinPrice())==-1 )).collect(Collectors.toList());
-            list=list.stream().filter(s->(s.getUseMinPrice().compareTo(param.getUseMinPrice())==-1 )).collect(Collectors.toList());
+            list=list.stream().filter(s->(s.getCouponPrice().compareTo(param.getUseMinPrice()) < 0 )).collect(Collectors.toList());
+            list=list.stream().filter(s->(s.getUseMinPrice().compareTo(param.getUseMinPrice()) < 0 )).collect(Collectors.toList());
             return R.ok().put("data",list);
         } catch (Exception e){
             return R.error("操作异常");

fs-user-app/src/main/java/com/fs/app/controller/DepartmentController.java

@@ -1,7 +1,6 @@
 package com.fs.app.controller;
 
 
-import com.fs.app.utils.JwtUtils;
 import com.fs.common.core.domain.R;
 import com.fs.store.domain.FsDepartment;
 import com.fs.store.service.IFsDepartmentService;
@@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 
@@ -21,12 +19,11 @@ import java.util.List;
 @RequestMapping(value="/app/department")
 public class DepartmentController {
 	@Autowired
-    JwtUtils jwtUtils;
-	@Autowired
 	private IFsDepartmentService departmentService;
+
 	@ApiOperation("获取科室列表")
 	@GetMapping("/getDepartmentList")
-	public R getDepartmentList(FsDepartment param,HttpServletRequest request){
+	public R getDepartmentList(FsDepartment param){
 		try {
 			param.setStatus(1);
 			List<FsDepartment> list=departmentService.selectFsDepartmentList(param);

fs-user-app/src/main/java/com/fs/app/controller/DiseaseController.java

@@ -43,7 +43,7 @@ public class DiseaseController extends  AppBaseController {
 
     @ApiOperation("获取疾病详情")
     @GetMapping("/getDiseaseById")
-    public R getDiseaseById(@RequestParam("diseaseId")Long diseaseId, HttpServletRequest request){
+    public R getDiseaseById(@RequestParam("diseaseId")Long diseaseId){
         FsDisease disease=diseaseService.selectFsDiseaseByDiseaseId(diseaseId);
         return R.ok().put("data",disease);
     }

fs-user-app/src/main/java/com/fs/app/controller/DocController.java

@@ -29,25 +29,19 @@ import java.util.List;
 @Api("随访接口")
 @RestController
 @RequestMapping(value="/app/doc")
-public class DocController extends  AppBaseController {
+public class DocController extends AppBaseController {
 	@Autowired
-    JwtUtils jwtUtils;
+	private IDocService docService;
 	@Autowired
-	IDocService docService;
+	private IDocRecordService docRecordService;
 	@Autowired
-	IDocOrderService docOrderService;
+	private IDocRecordReplyService docRecordReplyService;
 	@Autowired
-	IDocRecordService docRecordService;
-	@Autowired
-	IDocRecordReplyService docRecordReplyService;
-	@Autowired
-	IDocOrderReplyService docOrderReplyService;
-	@Autowired
-	ICompanyUserService companyUserService;
+	private ICompanyUserService companyUserService;
 	@Login
 	@ApiOperation("获取健康档案")
 	@GetMapping("/getMyDocList")
-	public R getMyDocList(DocQueryParam param, HttpServletRequest request){
+	public R getMyDocList(DocQueryParam param){
 		param.setUserId(Long.parseLong(getUserId()));
 		List<DocListQueryVO> list=docService.selectDocListVOQuery(param);
 		return R.ok().put("data",list);
@@ -56,7 +50,7 @@ public class DocController extends  AppBaseController {
 	@Login
 	@ApiOperation("获取健康档案")
 	@GetMapping("/getDocDetails")
-	public R getDocDetails(@RequestParam("docId") Long docId, HttpServletRequest request){
+	public R getDocDetails(@RequestParam("docId") Long docId){
 		Doc doc=docService.selectDocById(docId);
 		List<DocCompanyUserVO> users=companyUserService.selectDocCompanyUserListByIds(doc.getCompanyUserIds());
 		return R.ok().put("data",docService.selectDocById(docId)).put("users",users);
@@ -66,7 +60,7 @@ public class DocController extends  AppBaseController {
 	@Login
 	@ApiOperation("添加健康档案")
 	@PostMapping("/addDoc")
-	public R addDoc(@Valid @RequestBody Doc param, HttpServletRequest request){
+	public R addDoc(@Valid @RequestBody Doc param){
 		param.setUserId(Long.parseLong(getUserId()));
 		param.setCreateTime(new Date());
 		docService.insertDoc(param);
@@ -76,7 +70,7 @@ public class DocController extends  AppBaseController {
 	@Login
 	@ApiOperation("编辑健康档案")
 	@PostMapping("/editDoc")
-	public R editDoc(@Valid @RequestBody Doc param, HttpServletRequest request){
+	public R editDoc(@Valid @RequestBody Doc param){
 		param.setUserId(Long.parseLong(getUserId()));
 		param.setUpdateTime(new Date());
 		docService.updateDoc(param);
@@ -86,14 +80,14 @@ public class DocController extends  AppBaseController {
 	@Login
 	@ApiOperation("删除健康档案")
 	@PostMapping("/delDoc")
-	public R delDoc(@Valid @RequestBody Doc param, HttpServletRequest request){
+	public R delDoc(@Valid @RequestBody Doc param){
 		docService.deleteDocById(param.getDocId());
 		return R.ok("操作成功");
 	}
 	@Login
 	@ApiOperation("获取健康记录列表")
 	@GetMapping("/getMyDocRecordList")
-	public R getMyDocRecordList(DocRecordQueryParam param, HttpServletRequest request){
+	public R getMyDocRecordList(DocRecordQueryParam param){
 		PageHelper.startPage(param.getPage(), param.getPageSize());
 		List<DocRecordListQueryVO> list=docRecordService.selectDocRecordListVOQuery(param);
 		PageInfo<DocRecordListQueryVO> listPageInfo=new PageInfo<>(list);
@@ -103,7 +97,7 @@ public class DocController extends  AppBaseController {
 	@Login
 	@ApiOperation("获取健康记录回复列表")
 	@GetMapping("/getDocRecordReplyList")
-	public R getDocRecordReplyList(DocRecordReplyQueryParam param, HttpServletRequest request){
+	public R getDocRecordReplyList(DocRecordReplyQueryParam param){
 		PageHelper.startPage(param.getPage(), param.getPageSize());
 		List<DocRecordReplyListQueryVO> list=docRecordReplyService.selectDocRecordReplyListVOQuery(param);
 		PageInfo<DocRecordReplyListQueryVO> listPageInfo=new PageInfo<>(list);
@@ -113,43 +107,11 @@ public class DocController extends  AppBaseController {
 	@Login
 	@ApiOperation("添加健康记录档案")
 	@PostMapping("/addDocRecord")
-	public R addDocRecord(@Valid @RequestBody DocRecord param, HttpServletRequest request){
+	public R addDocRecord(@Valid @RequestBody DocRecord param){
 		param.setUserId(Long.parseLong(getUserId()));
 		param.setCreateTime(new Date());
 		docRecordService.insertDocRecord(param);
 		return R.ok("操作成功");
 	}
 
-//	@Login
-//	@ApiOperation("获取问医生列表")
-//	@GetMapping("/getMyDocOrderList")
-//	public R getMyDocOrderList(DocOrderQueryParam param, HttpServletRequest request){
-//		PageHelper.startPage(param.getPage(), param.getPageSize());
-//		param.setUserId(Long.parseLong(getUserId()));
-//		List<DocOrderListQueryVO> list=docOrderService.selectDocOrderListVOQuery(param);
-//		PageInfo<DocOrderListQueryVO> listPageInfo=new PageInfo<>(list);
-//		return R.ok().put("data",listPageInfo);
-//	}
-
-//	@Login
-//	@ApiOperation("获取问医生回复列表")
-//	@GetMapping("/getDocOrderReplyList")
-//	public R getDocOrderReplyList(DocOrderReplyQueryParam param, HttpServletRequest request){
-//		PageHelper.startPage(param.getPage(), param.getPageSize());
-//		List<DocOrderReplyListQueryVO> list=docOrderReplyService.selectDocOrderReplyListVOQuery(param);
-//		PageInfo<DocOrderReplyListQueryVO> listPageInfo=new PageInfo<>(list);
-//		return R.ok().put("data",listPageInfo);
-//	}
-//
-//	@Login
-//	@ApiOperation("提交问医生")
-//	@PostMapping("/addDocOrder")
-//	public R addDocOrder(@Valid @RequestBody DocOrder param, HttpServletRequest request){
-//		param.setUserId(Long.parseLong(getUserId()));
-//		param.setCreateTime(new Date());
-//		docOrderService.insertDocOrder(param);
-//		return R.ok("操作成功");
-//	}
-
-
 }

fs-user-app/src/main/java/com/fs/app/controller/DoctorArticleController.java

@@ -21,7 +21,7 @@ import java.util.List;
 @Api("医生文章接口")
 @RestController
 @RequestMapping(value="/app/doctorArticle")
-public class DoctorArticleController extends  AppBaseController {
+public class DoctorArticleController extends AppBaseController {
 
 
     @Autowired

fs-user-app/src/main/java/com/fs/app/controller/IndexController.java

@@ -1,7 +1,6 @@
 package com.fs.app.controller;
 
 
-import cn.hutool.json.JSONUtil;
 import com.fs.app.annotation.Login;
 import com.fs.app.vo.IndexVO;
 import com.fs.common.core.domain.R;
@@ -17,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.Cacheable;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 
@@ -35,7 +33,20 @@ public class IndexController extends AppBaseController {
 	@Autowired
 	private IFsStoreProductService productService;
 
+	@Autowired
+	private IFsFamousPrescribeService fsFamousPrescribeService;
+
+	@Autowired
+	private IFsQuestionsService questionsService;
+
+	@Autowired
+	private IFsMedicatedFoodService medicatedFoodService;
+
+	@Autowired
+	private IFsVesselService vesselService;
 
+	@Autowired
+	private IFsChineseMedicineService chineseMedicineService;
 
 	@Autowired
 	private IFsArticleService articleService;
@@ -46,9 +57,10 @@ public class IndexController extends AppBaseController {
 	private IFsMenuService menuService;
 	@Autowired
 	private IFsStoreCanvasService storeCanvasService;
+
 	@ApiOperation("获取首页数据")
 	@GetMapping("/getIndexData")
-	public R getIndexData(HttpServletRequest request){
+	public R getIndexData(){
 		List<FsArticleCateListQueryVO> articleCateList=articleCateService.selectFsArticleCateListQuery();
 		List<FsAdvListQueryVO> advList=advService.selectFsAdvListQuery(1);
 		List<FsStoreProductListQueryVO> newProductList=productService.selectFsStoreProductNewQuery(10);
@@ -57,24 +69,20 @@ public class IndexController extends AppBaseController {
 		return R.ok().put("data", vo);
 	}
 
-
-
-
 	@ApiOperation("读取菜单数据")
 	@GetMapping("/getMenu")
 	@Cacheable("menu")
-	public R getMenu(HttpServletRequest request){
+	public R getMenu(){
 		FsMenu map=new FsMenu();
 		map.setIsShow(1);
 		List<FsMenu> list=menuService.selectFsMenuList(map);
 		return R.ok().put("data",list);
 	}
 
-
 	@ApiOperation("读取画布数据")
 	@GetMapping("/getCanvas")
 	@Cacheable("canvas")
-	public R getCanvas(HttpServletRequest request){
+	public R getCanvas(){
 		FsStoreCanvas map=new FsStoreCanvas();
 		map.setIsDel(0);
 		map.setType(1);
@@ -82,8 +90,6 @@ public class IndexController extends AppBaseController {
 		return R.ok().put("data", canvas.get(0));
 	}
 
-
-
 	@ApiOperation("获取推荐健康知识")
 	@GetMapping("/getTuiArticle")
 	public R getTuiArticle(FsArticleQueryParam param){
@@ -92,7 +98,6 @@ public class IndexController extends AppBaseController {
 		return R.ok().put("data", list);
 	}
 
-
 	@Login
 	@ApiOperation("获取购物车数量")
 	@GetMapping("/getCartCount")
@@ -101,21 +106,6 @@ public class IndexController extends AppBaseController {
 		return R.ok().put("data", count);
 	}
 
-	@Autowired
-	private IFsFamousPrescribeService fsFamousPrescribeService;
-
-	@Autowired
-	private IFsQuestionsService questionsService;
-
-	@Autowired
-	private IFsMedicatedFoodService medicatedFoodService;
-
-	@Autowired
-	private IFsVesselService vesselService;
-
-	@Autowired
-	private IFsChineseMedicineService chineseMedicineService;
-
 	@ApiOperation("获取名方列表")
 	@GetMapping("/getFamousPrescribeList")
 	public R getFamousPrescribeList(FsFamousPrescribeListUParam param)

fs-user-app/src/main/java/com/fs/app/controller/PatientController.java

@@ -29,7 +29,7 @@ public class PatientController extends  AppBaseController {
     @Login
     @ApiOperation("获取病人列表")
     @GetMapping("/getPatientList")
-    public R getPatientList(HttpServletRequest request){
+    public R getPatientList(){
         try {
             FsPatient map=new FsPatient();
             map.setUserId(Long.parseLong(getUserId()));
@@ -44,7 +44,7 @@ public class PatientController extends  AppBaseController {
     @Login
     @ApiOperation("获取病人详情")
     @GetMapping("/getPatientById")
-    public R getPatientById(@RequestParam("patientId")Long patientId, HttpServletRequest request){
+    public R getPatientById(@RequestParam("patientId")Long patientId){
         FsPatient data=patientService.selectFsPatientById(patientId);
         if(!data.getUserId().equals(Long.parseLong(getUserId()))){
 
@@ -55,7 +55,7 @@ public class PatientController extends  AppBaseController {
     @Login
     @ApiOperation("添加病人")
     @PostMapping("/addPatient")
-    public R addPatient(@Valid @RequestBody FsPatientAddEditParam param, HttpServletRequest request){
+    public R addPatient(@Valid @RequestBody FsPatientAddEditParam param){
         if(param.getBirthday()==null){
             return R.error("生日不能为空");
         }
@@ -71,7 +71,7 @@ public class PatientController extends  AppBaseController {
     @Login
     @ApiOperation("编辑病人")
     @PostMapping("/editPatient")
-    public R editPatient(@Valid @RequestBody FsPatientAddEditParam param, HttpServletRequest request){
+    public R editPatient(@Valid @RequestBody FsPatientAddEditParam param){
         FsPatient patient=new FsPatient();
         BeanUtil.copyProperties(param, patient);
         patientService.updateFsPatient(patient);
@@ -81,7 +81,7 @@ public class PatientController extends  AppBaseController {
     @Login
     @ApiOperation("删除病人")
     @PostMapping("/delPatient")
-    public R delPatient(@RequestBody FsPatientAddEditParam param, HttpServletRequest request){
+    public R delPatient(@RequestBody FsPatientAddEditParam param){
         patientService.deleteFsPatientById(param.getPatientId());
         return R.ok("操作成功");
     }

fs-user-app/src/main/java/com/fs/app/controller/PayController.java

@@ -2,22 +2,15 @@ package com.fs.app.controller;
 
 
 import com.alibaba.fastjson.JSON;
-import com.fs.common.config.FSSysConfig;
 import com.fs.common.core.controller.BaseController;
-import com.fs.common.core.redis.RedisCache;
-import com.fs.common.exception.CustomException;
-import com.fs.company.service.ICompanyService;
-import com.fs.company.service.ICompanyUserService;
 import com.fs.erp.service.IErpOrderService;
 import com.fs.huifuPay.domain.HuiFuResult;
 import com.fs.pay.pay.domain.OrderCallback;
 import com.fs.pay.pay.domain.OrderResult;
 import com.fs.pay.pay.dto.OrderQueryDTO;
 import com.fs.pay.pay.service.PayService;
-import com.fs.pay.pay.service.impl.PayApiServiceImpl;
 import com.fs.pay.pay.util.PayUtil;
 import com.fs.store.domain.*;
-import com.fs.store.enums.*;
 import com.fs.store.service.*;
 import com.fs.pay.service.dto.PayNotifyDTO;
 import com.fs.pay.service.dto.RefundNotifyDTO;
@@ -27,9 +20,6 @@ import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationEventPublisher;
-import org.springframework.transaction.annotation.Transactional;
-import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
@@ -43,23 +33,21 @@ import java.util.Map;
 @RequestMapping("/app/pay")
 public class PayController {
 
-    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    protected final Logger logger = LoggerFactory.getLogger(PayController.class);
 
     @Autowired
     private IFsStoreOrderService orderService;
-    @Autowired
-    IErpOrderService erpOrderService;
 
     @Autowired
     private IFsStorePaymentService storePaymentService;
 
     @Autowired
-    PayService ybPayService;
+    private PayService ybPayService;
 
 
     @ApiOperation("易宝第三方支付回调")
     @PostMapping(value="/ybPayNotify")
-    public String ybPayNotify(@RequestBody Map<String, String> params, @RequestBody OrderCallback o) throws Exception {
+    public String ybPayNotify(@RequestBody Map<String, String> params, @RequestBody OrderCallback o) {
         //验证
         String sign = PayUtil.sign(params);
         String sg = params.get("sign");
@@ -82,7 +70,7 @@ public class PayController {
     }
     @ApiOperation("汇付第三方支付回调")
     @PostMapping(value="/hfPayNotify")
-    public String hfPayNotify(@RequestParam String resp_desc, @RequestParam String resp_code, @RequestParam String sign, @RequestParam String resp_data) throws Exception {
+    public String hfPayNotify(@RequestParam String resp_desc, @RequestParam String resp_code, @RequestParam String sign, @RequestParam String resp_data) {
         //验证
         HuiFuResult o = JSON.parseObject(resp_data, HuiFuResult.class);
         logger.info("汇付支付回调:"+o);
@@ -104,7 +92,7 @@ public class PayController {
 
     @ApiOperation("小雨点第三方支付回调")
     @PostMapping(value="/payNotify")
-    public String payNotify(HttpServletRequest request,PayNotifyDTO dto) throws Exception {
+    public String payNotify(@RequestBody PayNotifyDTO dto) {
             if("SUCCESS".equals(dto.getOrderStatus())) {
                 //订单号
                 String tradeNo = dto.getMerchOrderNo();
@@ -129,7 +117,7 @@ public class PayController {
     }
     @ApiOperation("小雨点第三方退款回调")
     @PostMapping(value="/refundNotify")
-    public String refundNotify(HttpServletRequest request, RefundNotifyDTO dto) throws Exception {
+    public String refundNotify(@RequestBody RefundNotifyDTO dto) throws Exception {
         if("SUCCESS".equals(dto.getOrderStatus())) {
             String[] orderIds=dto.getOrigMerchOrderNo().split("-");
             FsStorePayment storePayment=null;

fs-user-app/src/main/java/com/fs/app/controller/PaymentController.java

@@ -4,7 +4,6 @@ package com.fs.app.controller;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import com.fs.common.annotation.RepeatSubmit;
-import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.R;
 import com.fs.common.utils.IpUtil;
 import com.fs.wx.miniapp.config.WxMaConfiguration;
@@ -33,12 +32,13 @@ import java.util.Date;
 public class PaymentController extends AppBaseController {
     @Autowired
     private WxMaProperties properties;
-    protected final Logger logger = LoggerFactory.getLogger(BaseController.class);
+    protected final Logger logger = LoggerFactory.getLogger(PaymentController.class);
 
     @Autowired
     private IFsStorePaymentService paymentService;
     @Autowired
     private IFsUserService userService;
+
     @ApiOperation("支付")
     @PostMapping("/payment")
     @RepeatSubmit
@@ -68,8 +68,6 @@ public class PaymentController extends AppBaseController {
             return R.error(e.getMessage());
         }
 
-
-
     }
 
 }

fs-user-app/src/main/java/com/fs/app/controller/PrescribeController.java

@@ -10,14 +10,11 @@ import com.fs.common.event.TemplateEvent;
 import com.fs.common.event.TemplateListenEnum;
 import com.fs.common.utils.ParseUtils;
 import com.fs.store.domain.FsStoreOrder;
-import com.fs.wx.pay.config.WxPayProperties;
 import com.fs.store.domain.FsPrescribe;
 import com.fs.store.param.*;
 import com.fs.store.service.IFsPrescribeService;
-import com.fs.store.service.IFsStoreOrderItemService;
 import com.fs.store.service.IFsStoreOrderService;
 import com.fs.store.vo.FsPrescribeVO;
-import com.github.binarywang.wxpay.service.WxPayService;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
@@ -38,19 +35,12 @@ import java.util.List;
 @RestController
 @RequestMapping(value="/app/prescribe")
 public class PrescribeController extends  AppBaseController {
-    @Autowired
-    private WxPayProperties wxPayProperties;
-    @Autowired
-    private WxPayService wxPayService;
     @Autowired
     private IFsStoreOrderService orderService;
 
     @Autowired
     private ApplicationEventPublisher publisher;
 
-    @Autowired
-    private IFsStoreOrderItemService itemService;
-
     @Autowired
     private IFsPrescribeService prescribeService;
 
@@ -58,7 +48,7 @@ public class PrescribeController extends  AppBaseController {
     @Login
     @ApiOperation("获取我的处方列表")
     @GetMapping("/getMyPrescribeList")
-    public R getMyPrescribeList(FsPrescribeQueryParam param, HttpServletRequest request){
+    public R getMyPrescribeList(FsPrescribeQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setUserId(Long.parseLong(getUserId()));
         List<FsPrescribeVO> list=prescribeService.selectFsPrescribeListQuery(param);
@@ -73,13 +63,13 @@ public class PrescribeController extends  AppBaseController {
     @Login
     @ApiOperation("开处方")
     @PostMapping("/doPrescribe")
-    public R doPrescribe(@Validated @RequestBody FsPrescribeParam param, HttpServletRequest request){
+    public R doPrescribe(@Validated @RequestBody FsPrescribeParam param){
         return prescribeService.doPrescribe(Long.parseLong(getUserId()),param);
     }
 
     @ApiOperation("通知地址")
     @PostMapping(value="/presribeNotify")
-    public String presribeNotify(HttpServletRequest request,@RequestBody String jsonBody) throws Exception
+    public String presribeNotify(@RequestBody String jsonBody) throws Exception
     {
         // 封装JSON请求
         //{"msg":"成功","code":1000,"data":{"rp_id":"202203151003300001","order_id":null,"depart_name":"内科","doctor_name":"测试账号","pharmacist_name":null,"rp_url":"https://asset.nxk520.com/202203-go/C2203151057038646.png","diagnose":"眼睑带状疱疹","rp_msg":"已开方","audit_reason":null,"drugInfo":[{"drug_name":"维力青 恩替卡韦分散片 0.5mg*7片","sale_amount":1,"drug_specification":"0.5mg*7片"}],"create_date":"2022-03-15 10:03:30","pharmacy_code":"00001","pharmacy_name":"测试门店","doctor_id":"383"}}

fs-user-app/src/main/java/com/fs/app/controller/ProductController.java

@@ -1,19 +1,10 @@
 package com.fs.app.controller;
 
 
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONUtil;
 import com.fs.app.annotation.Login;
 import com.fs.common.core.domain.R;
-import com.fs.common.exception.CustomException;
 import com.fs.common.param.BaseQueryParam;
-import com.fs.common.utils.StringUtils;
-import com.fs.erp.domain.ErpGoodsStock;
-import com.fs.erp.dto.ErpGoodsStockQueryRequert;
-import com.fs.erp.dto.ErpGoodsStockQueryResponse;
-import com.fs.erp.service.IErpGoodsService;
 import com.fs.store.domain.*;
-import com.fs.store.dto.StoreProductGroupDTO;
 import com.fs.store.param.*;
 import com.fs.store.service.*;
 import com.fs.store.vo.*;
@@ -25,7 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
 
@@ -41,22 +31,20 @@ public class ProductController extends  AppBaseController {
     private IFsStoreProductCategoryService categoryService;
     @Autowired
     private IFsStoreProductAttrService attrService;
-
     @Autowired
     private IFsStoreProductAttrValueService attrValueService;
     @Autowired
     private IFsStoreCartService cartService;
     @Autowired
     private IFsStoreProductRelationService productRelationService;
-    @Autowired
-    IErpGoodsService goodsService;
+
     /**
      * 获取用户信息
-     * @param request
-     * @return     */
+     * @return R
+     * */
     @ApiOperation("获取分类")
     @GetMapping("/getProductCate")
-    public R getProductCate(HttpServletRequest request){
+    public R getProductCate(){
         try {
             FsStoreProductCategory param=new FsStoreProductCategory();
             param.setIsShow(1);
@@ -69,7 +57,7 @@ public class ProductController extends  AppBaseController {
     }
     @ApiOperation("获取分类")
     @GetMapping("/getProductCateByPid")
-    public R getProductCateByPid(@RequestParam(value="pid") Long pid, HttpServletRequest request){
+    public R getProductCateByPid(@RequestParam(value="pid") Long pid){
         try {
             FsStoreProductCategory param=new FsStoreProductCategory();
             param.setIsShow(1);
@@ -84,7 +72,7 @@ public class ProductController extends  AppBaseController {
 
     @ApiOperation("获取商品列表")
     @GetMapping("/getProducts")
-    public R getProducts(FsStoreProductQueryParam param, HttpServletRequest request){
+    public R getProducts(FsStoreProductQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setIsDisplay(1);
         List<FsStoreProductListQueryVO> productList=productService.selectFsStoreProductListQuery(param);
@@ -133,26 +121,26 @@ public class ProductController extends  AppBaseController {
     @Login
     @ApiOperation("添加购物车")
     @PostMapping("/addCart")
-    public R addCart(@Validated @RequestBody FsStoreCartParam cartParam, HttpServletRequest request){
+    public R addCart(@Validated @RequestBody FsStoreCartParam cartParam){
         return cartService.addCart(Long.parseLong(getUserId()),cartParam);
     }
     @Login
     @ApiOperation("获取购物车列表")
     @GetMapping("/getCarts")
-    public R getCarts(HttpServletRequest request){
+    public R getCarts(){
         List<FsStoreCartVO> carts= cartService.selectFsStoreCartListByUid(Long.parseLong(getUserId()));
         return R.ok().put("carts",carts);
     }
     @Login
     @ApiOperation("改变购物车数量")
     @PostMapping("/cartNum")
-    public R cartNum(@Validated @RequestBody FsStoreCartNumParam cartParam, HttpServletRequest request){
+    public R cartNum(@Validated @RequestBody FsStoreCartNumParam cartParam){
         return cartService.changeNum(Long.parseLong(getUserId()),cartParam);
     }
     @Login
     @ApiOperation("删除购物车")
     @PostMapping("/delCart")
-    public R delCart(@Validated @RequestBody FsStoreCartDelParam cartParam, HttpServletRequest request){
+    public R delCart(@Validated @RequestBody FsStoreCartDelParam cartParam){
         return cartService.delCart(Long.parseLong(getUserId()),cartParam);
     }
 
@@ -168,19 +156,19 @@ public class ProductController extends  AppBaseController {
 
     @ApiOperation("获取推荐商品列表")
     @GetMapping("/getTuiProduct")
-    public R getTuiProduct(HttpServletRequest request){
+    public R getTuiProduct(){
         List<FsStoreProductListQueryVO> productList=productService.selectFsStoreProductTuiQuery(10);
         return R.ok().put("data", productList);
     }
     @ApiOperation("获取喜欢商品列表")
     @GetMapping("/getGoodsProduct")
-    public R getGoodsProduct(BaseQueryParam param,HttpServletRequest request){
+    public R getGoodsProduct(){
         List<FsStoreProductListQueryVO> productList=productService.selectFsStoreProductGoodQuery(10);
         return R.ok().put("data", productList);
     }
     @ApiOperation("获取推荐商品数据")
     @GetMapping("/getTuiProducts")
-    public R getTuiProducts(BaseQueryParam param, HttpServletRequest request){
+    public R getTuiProducts(BaseQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsStoreProductListQueryVO> list=productService.selectFsStoreProductTuiListQuery();
         PageInfo<FsStoreProductListQueryVO> listPageInfo=new PageInfo<>(list);
@@ -188,7 +176,7 @@ public class ProductController extends  AppBaseController {
     }
     @ApiOperation("获取喜欢商品数据")
     @GetMapping("/getGoodsProducts")
-    public R getGoodsProducts(BaseQueryParam param, HttpServletRequest request){
+    public R getGoodsProducts(BaseQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsStoreProductListQueryVO> list=productService.selectFsStoreProductGoodListQuery();
         PageInfo<FsStoreProductListQueryVO> listPageInfo=new PageInfo<>(list);
@@ -198,7 +186,7 @@ public class ProductController extends  AppBaseController {
 
     @ApiOperation("获取推广商品列表")
     @GetMapping("/getStoreProductAttrValueList")
-    public R getStoreProductAttrValueList(FsStoreProductAttrValueQueryParam param, HttpServletRequest request){
+    public R getStoreProductAttrValueList(FsStoreProductAttrValueQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsStoreProductAttrValueQueryVO> productList=attrValueService.selectStoreProductAttrValueListQuery(param);
         PageInfo<FsStoreProductAttrValueQueryVO> listPageInfo=new PageInfo<>(productList);

fs-user-app/src/main/java/com/fs/app/controller/StoreActivityController.java

@@ -1,6 +1,5 @@
 package com.fs.app.controller;
 
-
 import com.fs.common.core.domain.R;
 import com.fs.store.domain.*;
 import com.fs.store.service.*;
@@ -10,14 +9,13 @@ import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 
 @Api("活动接口")
 @RestController
 @RequestMapping(value="/app/activity")
-public class StoreActivityController extends  AppBaseController {
+public class StoreActivityController extends AppBaseController {
 
     @Autowired
     private IFsStoreActivityService activityService;
@@ -27,26 +25,24 @@ public class StoreActivityController extends  AppBaseController {
 
     @ApiOperation("获取活动")
     @GetMapping("/getStoreActivity")
-    public R getStoreActivity( HttpServletRequest request){
+    public R getStoreActivity(){
         FsStoreActivity activity=activityService.selectFsStoreActivityByTop();
         return R.ok().put("activity",activity);
     }
 
-
     @ApiOperation("获取活动详情")
     @GetMapping("/getStoreActivityDetails")
-    public R getStoreActivityDetails(@RequestParam(value = "activityId")Long activityId, HttpServletRequest request){
+    public R getStoreActivityDetails(@RequestParam(value = "activityId")Long activityId){
         FsStoreActivity activity=activityService.selectFsStoreActivityById(activityId);
         List<FsStoreProductActivityListVO> products=productService.selectFsStoreProductByIds(activity.getProductIds());
         return R.ok().put("activity",activity).put("products",products);
     }
+
     @ApiOperation("分享")
     @PostMapping("/share")
-    public R share(@RequestParam(value = "activityId")Long activityId, HttpServletRequest request){
+    public R share(@RequestParam(value = "activityId")Long activityId){
         activityService.addShare(activityId);
         return R.ok();
     }
 
-
-
 }

fs-user-app/src/main/java/com/fs/app/controller/StoreAfterSalesController.java

@@ -41,7 +41,7 @@ public class StoreAfterSalesController extends  AppBaseController {
     @Login
     @ApiOperation("获取订单项列表")
     @GetMapping("/getMyStoreOrderItemByOrderId")
-    public R getMyStoreOrderById(@RequestParam("orderId") Long orderId, HttpServletRequest request){
+    public R getMyStoreOrderById(@RequestParam("orderId") Long orderId){
         List<FsStoreOrderItemVO> list=itemService.selectFsStoreOrderItemListByOrderId(orderId);
         FsStoreOrder order=orderService.selectFsStoreOrderById(orderId);
         order.setUserPhone(ParseUtils.parsePhone(order.getUserPhone()));

fs-user-app/src/main/java/com/fs/app/controller/StoreOrderController.java

@@ -23,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.*;
 
 
@@ -161,7 +160,7 @@ public class StoreOrderController extends  AppBaseController {
     @Login
     @ApiOperation("亲友支付")
     @PostMapping("/otherPayment")
-    public R otherPayment(@Validated @RequestBody FsStoreOrderOtherPayParam param, HttpServletRequest request){
+    public R otherPayment(@Validated @RequestBody FsStoreOrderOtherPayParam param){
 
         logger.info("开始处理支付请求, 订单号: {}, 支付类型: 亲友支付", param.getOrderId());
         R result = null;
@@ -183,7 +182,7 @@ public class StoreOrderController extends  AppBaseController {
     @Login
     @ApiOperation("亲友支付")
     @PostMapping("/otherPaymentRemain")
-    public R otherPaymentRemain(@Validated @RequestBody FsStoreOrderOtherPayParam param, HttpServletRequest request){
+    public R otherPaymentRemain(@Validated @RequestBody FsStoreOrderOtherPayParam param){
         return orderService.otherPaymentRemain(param);
     }
 
@@ -191,7 +190,7 @@ public class StoreOrderController extends  AppBaseController {
     @Login
     @ApiOperation("取消订单")
     @PostMapping("/cancelOrder")
-    public R cancelOrder( @Validated @RequestBody FsStoreOrderCancelParam param, HttpServletRequest request){
+    public R cancelOrder( @Validated @RequestBody FsStoreOrderCancelParam param){
         FsStoreOrder order=orderService.selectFsStoreOrderById(param.getOrderId());
         if (ObjectUtil.isNull(order)) {
             throw new CustomException("订单不存在");
@@ -205,7 +204,7 @@ public class StoreOrderController extends  AppBaseController {
     @Login
     @ApiOperation("物流查询")
     @PostMapping("/getExpress")
-    public R getExpress( @Validated @RequestBody FsStoreOrderExpressParam param, HttpServletRequest request){
+    public R getExpress( @Validated @RequestBody FsStoreOrderExpressParam param){
         FsStoreOrder order=orderService.selectFsStoreOrderById(param.getOrderId());
         if (ObjectUtil.isNull(order)) {
             throw new CustomException("订单不存在");
@@ -221,7 +220,7 @@ public class StoreOrderController extends  AppBaseController {
     @Login
     @ApiOperation("物流查询多运单号")
     @PostMapping("/getExpressMulti")
-    public R getExpressMulti( @Validated @RequestBody FsStoreOrderExpressParam param, HttpServletRequest request){
+    public R getExpressMulti( @Validated @RequestBody FsStoreOrderExpressParam param){
         FsStoreOrder order=orderService.selectFsStoreOrderById(param.getOrderId());
         if (ObjectUtil.isNull(order)) {
             throw new CustomException("订单不存在");
@@ -236,28 +235,28 @@ public class StoreOrderController extends  AppBaseController {
     @Login
     @ApiOperation("确认套餐订单")
     @PostMapping("/confirmPackageOrder")
-    public R confirmPackageOrder(@Validated @RequestBody FsStoreConfirmPackageIdOrderParam param, HttpServletRequest request){
+    public R confirmPackageOrder(@Validated @RequestBody FsStoreConfirmPackageIdOrderParam param){
         return orderService.confirmPackageOrder(Long.parseLong(getUserId()),param);
     }
 
     @Login
     @ApiOperation("计算套餐订单")
     @PostMapping("/computedPackageOrder")
-    public R computedPackageOrder(@Validated @RequestBody FsStoreComputedPackageIdOrderParam param, HttpServletRequest request){
+    public R computedPackageOrder(@Validated @RequestBody FsStoreComputedPackageIdOrderParam param){
         return orderService.computedPackageOrder(Long.parseLong(getUserId()),param);
     }
 
     @Login
     @ApiOperation("创建订单")
     @PostMapping("/createPackageOrder")
-    public R createPackageOrder(@Validated @RequestBody FsStorePackageOrderCreateParam param, HttpServletRequest request){
+    public R createPackageOrder(@Validated @RequestBody FsStorePackageOrderCreateParam param){
         return orderService.createPackageOrder(Long.parseLong(getUserId()),param);
     }
 
     @Login
     @ApiOperation("完成订单")
     @PostMapping("/finishOrder")
-    public R finishOrder( @Validated @RequestBody FsStoreOrderFinishParam param, HttpServletRequest request){
+    public R finishOrder( @Validated @RequestBody FsStoreOrderFinishParam param){
         return orderService.finishOrder(param.getOrderId());
     }
 

fs-user-app/src/main/java/com/fs/app/controller/StoreProductPackageController.java

@@ -41,7 +41,7 @@ public class StoreProductPackageController extends  AppBaseController {
     @Login
     @ApiOperation("获取套餐列表")
     @GetMapping("/getStoreProductPackage")
-    public R getStoreProductPackage(FsStoreProductPackageQueryParam param, HttpServletRequest request){
+    public R getStoreProductPackage(FsStoreProductPackageQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setStatus(1);
         List<FsStoreProductPacketVO> list=productPackageService.selectFsStoreProductPackageListQueryVO(param);
@@ -50,7 +50,7 @@ public class StoreProductPackageController extends  AppBaseController {
     }
     @ApiOperation("获取套餐详情")
     @GetMapping("/getStoreProductPackageDetails")
-    public R getStoreProductPackageDetails(@RequestParam("packageId") Long packageId, HttpServletRequest request){
+    public R getStoreProductPackageDetails(@RequestParam("packageId") Long packageId){
         FsStoreProductPackage storeProductPackage=productPackageService.selectFsStoreProductPackageById(packageId);
         List<StoreOrderProductDTO> productList=new ArrayList<>();
         JSONArray jsonArray= JSONUtil.parseArray(storeProductPackage.getProducts());

fs-user-app/src/main/java/com/fs/app/controller/UserController.java

@@ -7,7 +7,6 @@ import cn.hutool.extra.qrcode.QrCodeUtil;
 import com.fs.app.annotation.Login;
 import com.fs.common.config.FSConfig;
 import com.fs.common.core.domain.R;
-import com.fs.common.exception.CustomException;
 import com.fs.common.param.BaseQueryParam;
 import com.fs.common.utils.OrderUtils;
 import com.fs.store.domain.FsUser;
@@ -20,16 +19,15 @@ import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
-import javax.servlet.http.HttpServletRequest;
 import java.awt.*;
 import java.io.File;
-import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.List;
@@ -38,6 +36,7 @@ import java.util.List;
 @Api("个人中心")
 @RestController
 @RequestMapping(value="/app/user")
+@Slf4j
 public class UserController extends  AppBaseController {
 
     @Autowired
@@ -57,12 +56,12 @@ public class UserController extends  AppBaseController {
     private IFsUserPromoterApplyService userPromoterApplyService;
     /**
      * 获取用户信息
-     * @param request
-     * @return     */
+     * @return R
+     * */
     @Login
     @ApiOperation("获取用户信息")
     @GetMapping("/getUserInfo")
-    public R getUserInfo(HttpServletRequest request){
+    public R getUserInfo(){
         try {
             FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
             return R.ok().put("user",user);
@@ -75,14 +74,14 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("检测是否登录")
     @GetMapping("/checkLogin")
-    public R checkLogin(HttpServletRequest request){
+    public R checkLogin(){
         return R.ok("认证成功");
     }
 
     @Login
     @ApiOperation("获取推荐海报")
     @GetMapping("/getTuiImg")
-    public R getTuiImg(HttpServletRequest request){
+    public R getTuiImg(){
         try {
             FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
             if(StringUtils.isEmpty(user.getUserCode())){
@@ -94,84 +93,58 @@ public class UserController extends  AppBaseController {
             }
             File newFile = new File("fx.jpg");
             File newFileT = new File("simsunb.ttf");
-            try {
-                InputStream stream =  getClass().getClassLoader().getResourceAsStream("fx.jpg");
-                FileUtils.copyInputStreamToFile(stream, newFile);
-                // if(!newFile.exists()){
-                //     InputStream stream =  getClass().getClassLoader().getResourceAsStream("fx.jpg");
-                //     FileUtils.copyInputStreamToFile(stream, newFile);
-                // }
-                if(!newFileT.exists()){
-                    InputStream streamT =  getClass().getClassLoader()
-                            .getResourceAsStream("simsunb.ttf");
-                    FileUtils.copyInputStreamToFile(streamT, newFileT);
-                }
-            } catch (IOException e) {
-
-                throw new CustomException(e.getMessage());
+            InputStream stream =  getClass().getClassLoader().getResourceAsStream("fx.jpg");
+            FileUtils.copyInputStreamToFile(stream, newFile);
+            if(!newFileT.exists()) {
+                InputStream streamT =  getClass().getClassLoader()
+                        .getResourceAsStream("simsunb.ttf");
+                FileUtils.copyInputStreamToFile(streamT, newFileT);
             }
 
-            try {
-                String url=fsConfig.getTuiImgPath()+"/tui-"+getUserId()+".jpg";
-                File outputFile = new File(url);
-                if(!outputFile.exists())
-                {
-                    try {
-                        outputFile.createNewFile();
-
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-                Font font =  Font.createFont(Font.TRUETYPE_FONT, newFileT);
-                Font f= font.deriveFont(Font.PLAIN,50);
-                ImgUtil.pressText(//
-                        newFile,
-                        outputFile,
-                        user.getNickname()+"邀您加入",
-                        Color.BLACK,
-                        f, //字体
-                        -60, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        900, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        0.8f//透明度：alpha 必须是范围 [0.0, 1.0] 之内（包含边界值）的一个浮点数字
-                );
-                ImgUtil.pressText(//
-                        outputFile,
-                        outputFile,
-                         "邀请码:"+user.getUserCode(),
-                        Color.BLACK,
-                        f, //字体
-                        -40, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        1000, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        0.8f//透明度：alpha 必须是范围 [0.0, 1.0] 之内（包含边界值）的一个浮点数字
-                );
-                File qr = new File(fsConfig.getTuiImgPath()+"/qr-"+getUserId()+".png");
-                if(!qr.exists())
-                {
-                    try {
-                        qr.createNewFile();
-
-                    } catch (IOException e) {
-                        e.printStackTrace();
-                    }
-                }
-                QrCodeUtil.generate(fsConfig.getUrl()+"/distribution?userCode="+user.getUserCode(), 300, 300,
-                        FileUtil.file(fsConfig.getTuiImgPath()+"/qr-"+getUserId()+".png"));
-                ImgUtil.pressImage(
-                        outputFile,
-                        outputFile,
-                        ImgUtil.read(qr), //QR图片
-                        -400, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        900, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
-                        1f
-                );
-                return R.ok().put("url","profile/tui/tui-"+getUserId()+".jpg");
-            } catch (Exception e) {
-                e.printStackTrace();
-                return R.error("操作异常");
+            String url=fsConfig.getTuiImgPath()+"/tui-"+getUserId()+".jpg";
+            File outputFile = new File(url);
+            if(!outputFile.exists()) {
+                outputFile.createNewFile();
             }
+            Font font =  Font.createFont(Font.TRUETYPE_FONT, newFileT);
+            Font f= font.deriveFont(Font.PLAIN,50);
+            ImgUtil.pressText(//
+                    newFile,
+                    outputFile,
+                    user.getNickname()+"邀您加入",
+                    Color.BLACK,
+                    f, //字体
+                    -60, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    900, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    0.8f//透明度：alpha 必须是范围 [0.0, 1.0] 之内（包含边界值）的一个浮点数字
+            );
+            ImgUtil.pressText(//
+                    outputFile,
+                    outputFile,
+                     "邀请码:"+user.getUserCode(),
+                    Color.BLACK,
+                    f, //字体
+                    -40, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    1000, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    0.8f//透明度：alpha 必须是范围 [0.0, 1.0] 之内（包含边界值）的一个浮点数字
+            );
+            File qr = new File(fsConfig.getTuiImgPath()+"/qr-"+getUserId()+".png");
+            if(!qr.exists()) {
+                qr.createNewFile();
+            }
+            QrCodeUtil.generate(fsConfig.getUrl()+"/distribution?userCode="+user.getUserCode(), 300, 300,
+                    FileUtil.file(fsConfig.getTuiImgPath()+"/qr-"+getUserId()+".png"));
+            ImgUtil.pressImage(
+                    outputFile,
+                    outputFile,
+                    ImgUtil.read(qr), //QR图片
+                    -400, //x坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    900, //y坐标修正值。 默认在中间，偏移量相对于中间偏移
+                    1f
+            );
+            return R.ok().put("url","profile/tui/tui-"+getUserId()+".jpg");
         } catch (Exception e){
-
+            log.error("获取推荐海报操作异常",e);
             return R.error("操作异常");
         }
     }
@@ -179,7 +152,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("获取我的推荐人")
     @GetMapping("/getMyTuiList")
-    public R getMyTuiList(BaseQueryParam param, HttpServletRequest request){
+    public R getMyTuiList(BaseQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsUserTuiVO> list= userService.selectFsUserTuiList(getUserId());
         PageInfo<FsUserTuiVO> listPageInfo=new PageInfo<>(list);
@@ -189,7 +162,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("获取用户金额")
     @GetMapping("/getTuiMoney")
-    public R getMemberTuiMoney(HttpServletRequest request){
+    public R getMemberTuiMoney(){
         try {
             FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
             BigDecimal yesterdayMoney=userBillService.selectFsUserBillTotalByUserId(getUserId(),"brokerage_price");
@@ -203,7 +176,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("获取我的推荐订单")
     @GetMapping("/getMyTuiOrderList")
-    public R getMyTuiOrderList(BaseQueryParam param,  HttpServletRequest request){
+    public R getMyTuiOrderList(BaseQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsStoreOrderTuiVO> list= orderService.selectFsStoreOrderTuiListVO(getUserId());
         PageInfo<FsStoreOrderTuiVO> listPageInfo=new PageInfo<>(list);
@@ -213,7 +186,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("获取用户佣金记录")
     @GetMapping("/getTuiMoneyLogs")
-    public R getTuiMoneyLogs(BaseQueryParam param, HttpServletRequest request){
+    public R getTuiMoneyLogs(BaseQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         FsUserBill map=new FsUserBill();
         map.setUserId(Long.parseLong(getUserId()));
@@ -227,7 +200,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("获取商品足迹")
     @GetMapping("/getProductFoots")
-    public R getProductFoots(FsStoreProductRelationQueryParam param, HttpServletRequest request){
+    public R getProductFoots(FsStoreProductRelationQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setUserId(Long.parseLong(getUserId()));
         List<FsStoreProductRelationQueryVO> list=productRelationService.selectFsStoreProductRelationListVOQuery(param);
@@ -238,7 +211,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("删除足迹")
     @PostMapping("/delProductFoots")
-    public R delProductFoots(@RequestBody FsStoreProductFootDelParam param, HttpServletRequest request){
+    public R delProductFoots(@RequestBody FsStoreProductFootDelParam param){
         productRelationService.deleteFsStoreProductRelationById(param.getId());
         return R.ok("操作成功");
     }
@@ -247,7 +220,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("申请提现")
     @PostMapping("/doExtract")
-    public R doExtract(@Validated  @RequestBody FsUseDoExtractParam param, HttpServletRequest request){
+    public R doExtract(@Validated  @RequestBody FsUseDoExtractParam param){
         param.setUserId(Long.parseLong(getUserId()));
         return userExtractService.doExtract(param);
     }
@@ -255,7 +228,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("获取提现记录")
     @GetMapping("/getExtractList")
-    public R getExtractList(FsUseExtractQueryParam param, HttpServletRequest request){
+    public R getExtractList(FsUseExtractQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setUserId(Long.parseLong(getUserId()));
         List<FsUserExtractVO> list=userExtractService.selectFsUserExtractListVOQuery(param);
@@ -266,7 +239,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("修改用户信息")
     @PostMapping("/editUser")
-    public R editUser(@RequestBody FsUserEditParam param, HttpServletRequest request){
+    public R editUser(@RequestBody FsUserEditParam param){
         FsUser user=new FsUser();
         user.setUserId(Long.parseLong(getUserId()));
         user.setAvatar(param.getAvatar());
@@ -281,7 +254,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("申请推广员")
     @PostMapping("/applyPromoter")
-    public R applyPromoter(@RequestBody FsUserPromoterApply param, HttpServletRequest request){
+    public R applyPromoter(@RequestBody FsUserPromoterApply param){
         param.setUserId(Long.parseLong(getUserId()));
 
         FsUserPromoterApply promoterApply=userPromoterApplyService.selectFsUserPromoterApplyByUserId(Long.parseLong(getUserId()));
@@ -299,7 +272,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("绑定推广员")
     @PostMapping("/bindPromoter")
-    public R bindPromoter(@RequestBody FsUserBindPromoterParam param, HttpServletRequest request){
+    public R bindPromoter(@RequestBody FsUserBindPromoterParam param){
 
         FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
         if(user.getIsPromoter()==null||user.getIsPromoter()==0){
@@ -325,7 +298,7 @@ public class UserController extends  AppBaseController {
     @Login
     @ApiOperation("获取分享用户列表")
     @GetMapping("/getUserShareList")
-    public R getUserShareList(UserShareListParam param, HttpServletRequest request){
+    public R getUserShareList(UserShareListParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         List<FsUserShareVO> list= userService.selectFsUserShareList(getUserId(),param.getType());
         PageInfo<FsUserShareVO> listPageInfo=new PageInfo<>(list);

fs-user-app/src/main/java/com/fs/app/controller/UserSignController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 
@@ -42,7 +41,7 @@ public class UserSignController extends  AppBaseController {
     @Login
     @ApiOperation("获取用户签到记录")
     @GetMapping("/getUserSign")
-    public R getUserSign(HttpServletRequest request){
+    public R getUserSign(){
         FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
         //获取签到配置
         String json=configService.selectConfigByKey("store.sign");
@@ -52,20 +51,9 @@ public class UserSignController extends  AppBaseController {
         return R.ok().put("isDaySign", isDaySign).put("signNum", signNum).put("integral",user.getIntegral().intValue()).put("sign", json);
     }
 
-
-    // @ApiOperation("获取积分记录")
-    // @GetMapping("/getIntegral")
-    // public R getIntegral(FsUserSignQueryParam param, HttpServletRequest request){
-    //     PageHelper.startPage(param.getPage(), param.getPageSize());
-    //
-    //     List<FsUserSign> list=signService.selectFsUserSignListQuery(param);
-    //     PageInfo<FsUserSign> listPageInfo=new PageInfo<>(list);
-    //     return R.ok().put("data",listPageInfo);
-    // }
-
     @ApiOperation("获取积分记录")
     @GetMapping("/getIntegral")
-    public R getIntegral(FsUserBillQueryParam param, HttpServletRequest request){
+    public R getIntegral(FsUserBillQueryParam param){
         PageHelper.startPage(param.getPage(), param.getPageSize());
         param.setUserId(param.getUserId());
         param.setCategory(BillDetailEnum.CATEGORY_2.getValue());
@@ -77,7 +65,7 @@ public class UserSignController extends  AppBaseController {
     @Login
     @ApiOperation("签到")
     @PostMapping("/sign")
-    public R sign(HttpServletRequest request){
+    public R sign(){
         FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
         Long integral=signService.sign(user);
         return R.ok("签到获得" + integral + "积分");

fs-user-app/src/main/java/com/fs/app/controller/WxJsapiController.java

@@ -9,7 +9,6 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.net.MalformedURLException;
 
 /**
  * jsapi 演示接口的 controller.

fs-user-app/src/main/java/com/fs/app/controller/WxMenuController.java

@@ -48,18 +48,10 @@ public class WxMenuController {
         button1.setName("今日歌曲");
         button1.setKey("V1001_TODAY_MUSIC");
 
-//        WxMenuButton button2 = new WxMenuButton();
-//        button2.setType(WxConsts.BUTTON_MINIPROGRAM);
-//        button2.setName("小程序");
-//        button2.setAppId("wx286b93c14bbf93aa");
-//        button2.setPagePath("pages/lunar/index.html");
-//        button2.setUrl("http://mp.weixin.qq.com");
-
         WxMenuButton button3 = new WxMenuButton();
         button3.setName("菜单");
 
         menu.getButtons().add(button1);
-//        menu.getButtons().add(button2);
         menu.getButtons().add(button3);
 
         WxMenuButton button31 = new WxMenuButton();

fs-user-app/src/main/java/com/fs/app/controller/WxPayController.java

@@ -40,11 +40,7 @@ public class WxPayController {
     @Autowired
     private IFsStoreOrderStatusService orderStatusService;
     @Autowired
-    private IFsUserBillService billService;
-    @Autowired
     private IFsUserService userService;
-    @Autowired
-    private ApplicationEventPublisher publisher;
     /**
      * 微信回调
      * 回调接口代码内部自动校验结果签名和业务代码
@@ -55,7 +51,7 @@ public class WxPayController {
     @ApiOperation("微信回调")
     @PostMapping("/wxPayNotify")
     @Transactional
-    public String wxPayNotify(HttpServletRequest request) throws Exception {
+    public String wxPayNotify(HttpServletRequest request) {
 
         try {
             String xmlResult = IOUtils.toString(request.getInputStream(), request.getCharacterEncoding());
@@ -72,7 +68,6 @@ public class WxPayController {
                     case "store":
                         return storeOrderOp(orderId[1],tradeNo);
 
-
                 }
                 return WxPayNotifyResponse.success("");
             }else{

fs-user-app/src/main/java/com/fs/app/controller/WxUserController.java

@@ -1,11 +1,7 @@
 package com.fs.app.controller;
 
 import cn.hutool.core.date.DateTime;
-import cn.hutool.core.util.StrUtil;
-import com.fs.app.annotation.Login;
-import com.fs.app.utils.JwtUtils;
 import com.fs.common.core.domain.R;
-import com.fs.common.core.redis.RedisCache;
 import com.fs.common.exception.CustomException;
 import com.fs.common.utils.OrderUtils;
 import com.fs.store.param.LoginMpWxParam;
@@ -15,8 +11,6 @@ import com.fs.wx.miniapp.config.WxMaProperties;
 import com.fs.store.domain.FsUser;
 import com.fs.store.param.LoginWxParam;
 import com.fs.store.service.IFsUserService;
-import com.fs.wx.mp.config.WxMpConfiguration;
-import com.fs.wx.mp.config.WxMpProperties;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.Synchronized;
@@ -27,17 +21,14 @@ import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
-import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
 import me.chanjar.weixin.common.error.WxErrorException;
 
 import java.util.Date;
-import java.util.concurrent.TimeUnit;
 
 /**
  * 微信小程序用户接口
@@ -51,15 +42,11 @@ public class WxUserController extends AppBaseController{
     @Autowired
     private WxMaProperties maProperties;
 
-    @Autowired
-    private WxMpProperties mpProperties;
     @Autowired
     private WxMpService wxMpService;
 
     @Autowired
     private IFsUserService userService;
-    @Autowired
-    JwtUtils jwtUtils;
 
     /**
      * 登陆接口
@@ -130,41 +117,10 @@ public class WxUserController extends AppBaseController{
            String token = jwtUtils.generateToken(user.getUserId());
            return R.ok("登录成功").put("token",token).put("user", user);
         } catch (WxErrorException e) {
-            //this.logger.error(e.getMessage(), e);
             return R.error("授权失败,"+e.getMessage());
         }
     }
 
-//    /**
-//     * <pre>
-//     * 获取微信用户信息
-//     * </pre>
-//     */
-//    @Login
-//    @ApiOperation("获取微信小程序用户信息")
-//    @PostMapping("/getWeixinInfo")
-//    public R getWeixinInfo(@RequestBody LoginMpWxParam param) {
-//        final WxMaService wxService = WxMaConfiguration.getMaService(maProperties.getConfigs().get(0).getAppid());
-//        try {
-//            WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
-//            // 用户信息校验
-//            if (!wxService.getUserService().checkUserInfo(session.getSessionKey(), param.getRawData(), param.getSignature())) {
-//                return R.error("user check failed");
-//            }
-//            // 解密用户信息
-//            WxMaUserInfo userInfo = wxService.getUserService().getUserInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
-//            FsUser user=userService.selectFsUserById(Long.parseLong(getUserId()));
-//            user.setNickname(userInfo.getNickName());
-//            user.setAvatar(userInfo.getAvatarUrl());
-//            user.setIsWeixinAuth(1);
-//            userService.updateFsUser(user);
-//            return R.ok();
-//        } catch (WxErrorException e) {
-//            e.printStackTrace();
-//        }
-//        return R.ok("授权成功");
-//    }
-
     @ApiOperation("小程序登录")
     @PostMapping("/loginByMiniApp")
     @Synchronized
@@ -176,7 +132,6 @@ public class WxUserController extends AppBaseController{
         try {
             WxMaJscode2SessionResult session = wxService.getUserService().getSessionInfo(param.getCode());
             // 解密
-//            WxMaPhoneNumberInfo phoneNoInfo = wxService.getUserService().getPhoneNoInfo(session.getSessionKey(), param.getEncryptedData(), param.getIv());
             FsUser user=userService.selectFsUserByMaOpenId(session.getOpenid());
             String ip = IpUtil.getRequestIp();
             if(user==null){
@@ -192,14 +147,7 @@ public class WxUserController extends AppBaseController{
                 else{
                     //写入
                     user=new FsUser();
-//                    if(param.getTuiUserId()!=null&&param.getTuiUserId()>0){
-//                        FsUser tuiUser=userService.selectFsUserById(param.getTuiUserId());
-//                        if(tuiUser!=null){
-//                            user.setSpreadUserId(param.getTuiUserId());
-//                        }
-//                    }
                     user.setUsername("");
-//                    user.setPhone(phoneNoInfo.getPhoneNumber());
                     user.setPhone("");
                     user.setNickname("微信用户");
                     user.setStatus(1);
@@ -226,7 +174,6 @@ public class WxUserController extends AppBaseController{
             String token = jwtUtils.generateToken(user.getUserId());
             return R.ok("登录成功").put("token",token).put("user", user);
         } catch (WxErrorException e) {
-            //this.logger.error(e.getMessage(), e);
             return R.error("授权失败,"+e.getMessage());
         }
     }