diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java index e388cb86d..c7e2a1c4a 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java @@ -50,7 +50,7 @@ public interface WxCouponOrderMapper extends CommonMapper { WxCouponOrder findDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId); List findListOfAdmin(WxCouponOrderBVo wxCouponOrder); - WxCouponOrder findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId); + WxCouponOrder findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId); //营销报表 券数据图表 //List couponDataMap(HashMap params); 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 28696ee95..5bd023f3c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1154,7 +1154,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { @Override public ResultData detailAdminVo(Long couponOrderId,TenantEntity tenantinfo) { - WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId(),tenantinfo.getFinalTenantId()); + WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId()); if (null == couponOrder) { return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); } diff --git a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java index 047cf7218..847aaa411 100644 --- a/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java +++ b/mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java @@ -101,6 +101,8 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ @Override public RefundNotifyAdapterResult notify(Map paramMap, EnumPayWay payWay) { + log.info("TtRefundAdapterService notify{}"+paramMap); + String appId = paramMap.get("appid"); WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId); if (appinfo == null) { @@ -113,7 +115,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); } if (!"SUCCESS".equals(paramMap.get("status"))) { - log.warn("notify refund, wxpay status not success, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); + log.error("notify refund, wxpay status not success, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); return notifyErrorResult("订单状态码非SUCCESS"); } String refundno = paramMap.get("cp_refundno"); @@ -121,7 +123,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ WxRefundOrder refundOrder = wxRefundOrderMapper.selectById(refundOrderId); // 验证退款金额 if (!paramMap.get("refund_amount").equals(refundOrder.getRefundFee().toString())) { - log.warn("notify refund, wxpay check refund_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); + log.error("notify refund, wxpay check refund_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); return notifyErrorResult("退款总金额不一致"); } log.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());