From 1da22a6d0446f7207df54f8a55e8ba2c535f0b53 Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Tue, 4 Sep 2018 22:36:10 +0800 Subject: [PATCH] =?UTF-8?q?[=E6=A8=A1=E6=9D=BF=E6=B6=88=E6=81=AF=E5=AE=9E?= =?UTF-8?q?=E7=8E=B0][=E6=96=B0=E5=BB=BA]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/WxPayOrderController.java | 9 +++++-- .../com/simple/service/WxPayOrderService.java | 2 ++ .../service/impl/WxPayOrderServiceImpl.java | 26 ++++++++++++++++++- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java b/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java index 6a3ce5167..1504b07cb 100644 --- a/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java +++ b/mallinkAdmin/src/main/java/com/simple/controller/WxPayOrderController.java @@ -1,9 +1,9 @@ package com.simple.controller; +import com.simple.service.WxAppinfoService; import com.simple.service.WxProfitSharingOrderService; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.Assert; import org.springframework.web.bind.annotation.*; import com.github.pagehelper.PageInfo; @@ -73,10 +73,15 @@ public class WxPayOrderController extends BaseController @Autowired private WxProfitSharingOrderService xProfitSharingOrderService; + @Autowired + private WxAppinfoService wxAppinfoService; + @ApiOperation("测试分账") @GetMapping("/sharing") public ResultData test() { - xProfitSharingOrderService.test(); + //xProfitSharingOrderService.test(); + wxPayOrderService.sendPaySuccess(); + return new ResultData(); } diff --git a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java index 09bd8b5dd..1d110f4a6 100644 --- a/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxPayOrderService.java @@ -109,5 +109,7 @@ public interface WxPayOrderService { */ void deleteById(Long id); + void sendPaySuccess(); + } diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java index 24d79b677..ee68e4d48 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxPayOrderServiceImpl.java @@ -23,6 +23,7 @@ import com.simple.service.WxOrderService; import com.simple.service.WxPayOrderService; import com.simple.utils.*; import me.chanjar.weixin.common.error.WxErrorException; +import org.apache.commons.lang3.StringUtils; import org.apache.log4j.Logger; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -506,6 +507,23 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { */ } + @Override + public void sendPaySuccess() { + /* + WxAppinfo appinfoQ = new WxAppinfo(); + appinfoQ.setTenantId("234"); + appinfoQ.setType(EnumAppType.C.getCode()); + List appinfoList= wxAppinfoMapper.select(appinfoQ); + WxAppinfo appinfo = appinfoList.get(0); + + String payOrderIdStr = "196936823522459648"; + Long payOrderId = Long.valueOf(payOrderIdStr); + WxPayOrder updateOrder = wxPayOrderMapper.selectByPrimaryKey(payOrderId); + WxOrder order = wxOrderMapper.selectByPrimaryKey(updateOrder.getOrderId()); + sendPaySuccessMsg(appinfo, order, updateOrder); + */ + } + /** * 微信模板通知用户 * @param updateOrder @@ -549,13 +567,19 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { throw new MallinkException(ErrorCode.USER_IS_EMPTY); } + if (StringUtils.isBlank(updateOrder.getPrepayId())) { + logger.error("prepayId为空"); + throw new MallinkException(ErrorCode.USER_IS_EMPTY); + } + WxMaService wxMaService = MaUtil.getWeappService(appInfo); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); WxMaTemplateMessage templateMessage = WxMaTemplateMessage.builder() .toUser(user.getOpenId()) .formId(updateOrder.getPrepayId()) // 微信支付的formId是prepayId - .page("index") + .page("pages/index/index") .data(Lists.newArrayList( new WxMaTemplateMessage.Data("keyword1", dateFormat.format(new Date()), "#173177"), new WxMaTemplateMessage.Data("keyword2", "微信支付", "#173177"),