diff --git a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java index f0e14159f..17d2fe6ae 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/BaseController.java @@ -33,19 +33,12 @@ import java.util.Date; @Slf4j @RestController public class BaseController { - @Autowired - private boolean isFmOpen; + @Autowired private WxMerchantBUserService wxMerchantBUserService; @Autowired private WxAppinfoService wxAppinfoService; - - @Autowired - private FmOpenService openService; - - @Autowired - private CUserTokenService cUserTokenService; @Autowired MaUtil maUtil; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosController.java index 58f8c5df2..edb0fbf83 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosController.java @@ -3,7 +3,6 @@ package com.iformall.controller; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchantBUser; -import com.iformall.domain.po.base.TenantEntity; import com.iformall.exception.MallinkException; import com.iformall.pay.WxPayConstant; import com.iformall.service.PosBrunService; @@ -21,6 +20,7 @@ import java.util.Map; @RequestMapping("/api/pos") @Api(description = "POS服务相关接口") public class PosController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java index 0886598c5..cd1f409cc 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java @@ -24,8 +24,8 @@ import io.swagger.annotations.ApiOperation; @AllArgsConstructor @Api(description = "POS订单接口") public class PosOrderController extends BaseController { - private final Logger logger = LoggerFactory.getLogger(this.getClass()); + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final PosOrderService posOrderService; diff --git a/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java index 3235f5748..58093e6aa 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/PosPayOrderController.java @@ -21,11 +21,11 @@ import io.swagger.annotations.ApiOperation; @AllArgsConstructor @Api(description = "POS支付订单接口") public class PosPayOrderController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); private final PosPayOrderService posPayOrderService; - @ApiOperation("分页列表接口") @GetMapping("list") @ApiImplicitParams({ diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java index ac7f2b92a..c568ac29a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxBillController.java @@ -1,7 +1,5 @@ package com.iformall.controller; - -import com.iformall.common.ErrorCode; import com.iformall.common.Result; import com.iformall.common.ResultData; import com.iformall.domain.po.WxMerchant; @@ -29,6 +27,7 @@ import java.util.Map; @Api(description = "账单") @RequestMapping("/api/bill") public class WxBillController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java index 8c5bda4fd..b6d526ce1 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java @@ -1,6 +1,5 @@ package com.iformall.controller; - import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.*; @@ -29,6 +28,7 @@ import java.util.Map; @Api(description = "C端扫B端商户码储值卡支付") @RequestMapping("/api/cardPay") public class WxCardPayController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java index 9aa899e37..9cdd9c3e6 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCashOutController.java @@ -9,7 +9,6 @@ import com.iformall.enums.EnumCashOutStatus; import com.iformall.enums.EnumPayShare; import com.iformall.enums.EnumPayWay; import com.iformall.service.*; -import com.iformall.utils.DateUtils; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -17,7 +16,6 @@ import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import java.util.ArrayList; -import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,6 +35,7 @@ import org.springframework.web.bind.annotation.*; @RequestMapping("/api/cashout") @Api(description = "提现相关接口") public class WxCashOutController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java index df4c1af82..1f85108ee 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java @@ -27,6 +27,7 @@ import java.util.List; @RequestMapping("/api/wxCouponChannel") @Api(description = "优惠券投放接口") public class WxCouponChannelController extends BaseController { + private final Logger logger = LoggerFactory.getLogger(this.getClass()); @Autowired diff --git a/mallinkBApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java b/mallinkBApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java new file mode 100644 index 000000000..19c7f6a76 --- /dev/null +++ b/mallinkBApi/src/main/java/com/iformall/interceptor/TestControllerReturnAspect.java @@ -0,0 +1,68 @@ +package com.iformall.interceptor; + +import com.alibaba.fastjson.JSON; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.context.request.RequestAttributes; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; + +import javax.servlet.http.HttpServletRequest; +import java.io.BufferedReader; +import java.io.IOException; + + +/** + * 测试所有controler请求返回信息输出 + * @author alascor + * + */ +@Aspect +@Configuration +@Slf4j +public class TestControllerReturnAspect { + + + @Pointcut("execution(* com.iformall.controller.*Controller.*(..))") + public void excudeService() { + } + + @Around("excudeService()") + public Object doAround(ProceedingJoinPoint pjp) throws Throwable { + RequestAttributes ra = RequestContextHolder.getRequestAttributes(); + ServletRequestAttributes sra = (ServletRequestAttributes) ra; + HttpServletRequest request = sra.getRequest(); + + String method = request.getMethod(); + String uri = request.getRequestURI(); + String paraString = JSON.toJSONString(request.getParameterMap()); + String requestBody = getBodyRequest(request); + //log.info("***************************************************"); + //log.info("请求开始, URI: {}, method: {}, params: {}", uri, method, paraString); + + // result的值就是被拦截方法的返回值 + Object result = pjp.proceed(); + log.info("开发调试请求结果日志,生产请关闭!!!!>>>>>>>>请求结束,URI: {}, method: {}, params: {},requestBody:{}. 返回值:{} " ,uri, method, paraString,requestBody, JSON.toJSONString(result)); + return result; + } + + private String getBodyRequest(HttpServletRequest request) throws IOException { + // 直接从HttpServletRequest的Reader流中获取RequestBody + BufferedReader reader = request.getReader(); + StringBuilder builder = new StringBuilder(); + String line = reader.readLine(); + while(line != null){ + builder.append(line); + line = reader.readLine(); + } + reader.close(); + + String reqBody = builder.toString(); + return reqBody; + } + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java index 972301e71..1e0b431ce 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -2962,11 +2962,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { List merchantCouponIds = wxCouponMerchantMapper.findMerchantProductIds(tenantEntity.getTenantId(), merchantIds, null); WxCoupon couponQ = new WxCoupon(); couponQ.updateTenantInfo(tenantEntity); - List statusList = new ArrayList(); - statusList.add(1); - statusList.add(2); - statusList.add(6); - couponQ.setStatusList(statusList); + List typeList = new ArrayList(); + typeList.add(EnumCouponType.COUPON_MANJIAN.getCode()); + typeList.add(EnumCouponType.COUPON_DAIJIN.getCode()); + typeList.add(EnumCouponType.COUPON_MULTIMCH.getCode()); + couponQ.setTypes(typeList); List couponIds = wxCouponMapper.findIdList(couponQ); List realCouponIds = new ArrayList(); if (null != merchantCouponIds) { diff --git a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml index dff01e38f..a27291bf0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponMapper.xml @@ -308,13 +308,6 @@ - - and status in - - #{statusItem} - - - and type in