| @@ -175,14 +175,14 @@ public class WxAppinfoController extends BaseController { | |||||
| // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| // } | // } | ||||
| WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(ifParentUpdateAloneTenantInfo().getTenantId(), null); | WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(ifParentUpdateAloneTenantInfo().getTenantId(), null); | ||||
| return new ResultData(cAppInfo); | |||||
| return new ResultData(new WxAppinfo(cAppInfo.getMouldType())); | |||||
| } | } | ||||
| @PostMapping("updateAppMouldType") | @PostMapping("updateAppMouldType") | ||||
| @SystemControllerLog(description = "修改小程序首页风格") | @SystemControllerLog(description = "修改小程序首页风格") | ||||
| public ResultData updateAppMouldType(@RequestBody WxAppinfo appinfo) { | public ResultData updateAppMouldType(@RequestBody WxAppinfo appinfo) { | ||||
| logger.debug("[" + getIpAddr() + "] WxAppinfoController::updateAppMouldType"); | logger.debug("[" + getIpAddr() + "] WxAppinfoController::updateAppMouldType"); | ||||
| if(appinfo == null || appinfo.getId() == null || appinfo.getMouldType() == null){ | |||||
| if(appinfo.getMouldType() == null){ | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| // WxAppinfo updateAppinfo = new WxAppinfo(); | // WxAppinfo updateAppinfo = new WxAppinfo(); | ||||
| @@ -531,6 +531,7 @@ public class WxInfoController extends BaseController { | |||||
| // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | // return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| // } | // } | ||||
| WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(getTenantInfo().getTenantId(), null); | WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(getTenantInfo().getTenantId(), null); | ||||
| return new ResultData(cAppInfo); | |||||
| return new ResultData(new WxAppinfo(cAppInfo.getMouldType())); | |||||
| } | } | ||||
| } | } | ||||
| @@ -71,7 +71,7 @@ public class TtPayController extends BaseController { | |||||
| @PostMapping(value = "/orderPay") | @PostMapping(value = "/orderPay") | ||||
| @ResponseBody | @ResponseBody | ||||
| public Map<String,Object> createOrder( @RequestBody Map<String, Object> parameterMap){ | public Map<String,Object> createOrder( @RequestBody Map<String, Object> parameterMap){ | ||||
| logger.debug("[" + getIpAddr() + "] TtOrderCallbackController::createOrder"); | |||||
| logger.debug("[" + getIpAddr() + "] TtOrderCallbackController::orderPay"); | |||||
| Map<String,Object> resultMap = new HashMap<>(); | Map<String,Object> resultMap = new HashMap<>(); | ||||
| // String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); | // String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); | ||||
| @@ -123,13 +123,13 @@ public class TtPayController extends BaseController { | |||||
| }else if("refund".equals(type)){//退款回调 | }else if("refund".equals(type)){//退款回调 | ||||
| String cp_refundno = (String) pMap.get("cp_refundno"); | String cp_refundno = (String) pMap.get("cp_refundno"); | ||||
| String status = (String) pMap.get("status"); | String status = (String) pMap.get("status"); | ||||
| String refund_amount = (String) pMap.get("refund_amount"); | |||||
| Integer refund_amount = (Integer) pMap.get("refund_amount"); | |||||
| Map<String,String> map = new HashMap<>(); | Map<String,String> map = new HashMap<>(); | ||||
| map.put("appid",appid); | map.put("appid",appid); | ||||
| map.put("cp_refundno",cp_refundno); | map.put("cp_refundno",cp_refundno); | ||||
| map.put("status",status); | map.put("status",status); | ||||
| map.put("refund_amount",refund_amount); | |||||
| map.put("refund_amount",refund_amount.toString()); | |||||
| wxRefundOrderService.notify(map, EnumPayWay.PAY_WAY_TT); | wxRefundOrderService.notify(map, EnumPayWay.PAY_WAY_TT); | ||||
| resultMap.put("err_no",0); | resultMap.put("err_no",0); | ||||
| resultMap.put("err_tips","success"); | resultMap.put("err_tips","success"); | ||||
| @@ -137,7 +137,7 @@ public class TtPayController extends BaseController { | |||||
| return resultMap; | return resultMap; | ||||
| } catch (Exception e){ | } catch (Exception e){ | ||||
| e.printStackTrace(); | |||||
| logger.error(e.getMessage()); | |||||
| resultMap.put("err_tips","error"); | resultMap.put("err_tips","error"); | ||||
| return resultMap; | return resultMap; | ||||
| } | } | ||||
| @@ -46,4 +46,9 @@ public class WxAppinfo extends BaseTenantEntity { | |||||
| private Integer enable; | private Integer enable; | ||||
| @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") | @io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat") | ||||
| private Integer plat; | private Integer plat; | ||||
| public WxAppinfo(){} | |||||
| public WxAppinfo(Integer mouldType){ | |||||
| this.mouldType = mouldType; | |||||
| } | |||||
| } | } | ||||
| @@ -50,7 +50,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> { | |||||
| WxCouponOrder findDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId); | WxCouponOrder findDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId); | ||||
| List<WxCouponOrder> findListOfAdmin(WxCouponOrderBVo wxCouponOrder); | List<WxCouponOrder> 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<MarkingCouponDataReportVo> couponDataMap(HashMap<String,Object> params); | //List<MarkingCouponDataReportVo> couponDataMap(HashMap<String,Object> params); | ||||
| @@ -1163,7 +1163,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| @Override | @Override | ||||
| public ResultData detailAdminVo(Long couponOrderId,TenantEntity tenantinfo) { | 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) { | if (null == couponOrder) { | ||||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | ||||
| } | } | ||||
| @@ -101,6 +101,8 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ | |||||
| @Override | @Override | ||||
| public RefundNotifyAdapterResult notify(Map<String, String> paramMap, EnumPayWay payWay) { | public RefundNotifyAdapterResult notify(Map<String, String> paramMap, EnumPayWay payWay) { | ||||
| log.info("TtRefundAdapterService notify{}"+paramMap); | |||||
| String appId = paramMap.get("appid"); | String appId = paramMap.get("appid"); | ||||
| WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId); | WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId); | ||||
| if (appinfo == null) { | if (appinfo == null) { | ||||
| @@ -113,7 +115,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ | |||||
| throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); | throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND); | ||||
| } | } | ||||
| if (!"SUCCESS".equals(paramMap.get("status"))) { | 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"); | return notifyErrorResult("订单状态码非SUCCESS"); | ||||
| } | } | ||||
| String refundno = paramMap.get("cp_refundno"); | String refundno = paramMap.get("cp_refundno"); | ||||
| @@ -121,7 +123,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{ | |||||
| WxRefundOrder refundOrder = wxRefundOrderMapper.selectById(refundOrderId); | WxRefundOrder refundOrder = wxRefundOrderMapper.selectById(refundOrderId); | ||||
| // 验证退款金额 | // 验证退款金额 | ||||
| if (!paramMap.get("refund_amount").equals(refundOrder.getRefundFee().toString())) { | 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("退款总金额不一致"); | return notifyErrorResult("退款总金额不一致"); | ||||
| } | } | ||||
| log.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); | log.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString()); | ||||