'1'

twzd-admin/src/main/java/com/miaxis/app/controller/wx/WxNotifyController.java

@@ -1,35 +1,23 @@
 package com.miaxis.app.controller.wx;
 
 
-import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.miaxis.common.config.WxpayConfig;
 import com.miaxis.common.constant.Constants;
-import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.AesUtil;
-import com.miaxis.extension.service.IWxExtensionIncomeService;
-import com.miaxis.feign.dto.WxGzhMini;
-import com.miaxis.feign.dto.WxMessageTemplate;
-import com.miaxis.feign.service.IWxSendService;
-import com.miaxis.framework.web.service.TokenService;
 import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.wx.domain.RefundRecord;
-import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.WxNotifyReturnDTO;
 import com.miaxis.wx.dto.WxpayNotifyDTO;
 import com.miaxis.wx.service.IRefundRecordService;
-import com.miaxis.wx.service.IWxGzhService;
 import com.miaxis.wx.service.IWxOrderService;
 import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.Base64Utils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -42,7 +30,6 @@ import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.*;
 import java.security.cert.X509Certificate;
-import java.util.Date;
 
 @RestController
 @RequiredArgsConstructor
@@ -69,17 +56,9 @@ public class WxNotifyController {
     @Autowired
     private AutoUpdateCertificatesVerifier verifier;
 
-    @Autowired
-    private TokenService tokenService;
 
-    @Autowired
-    private IWxExtensionIncomeService wxExtensionIncomeService;
 
-    @Autowired
-    private IWxSendService wxSendService;
 
-    @Autowired
-    private IWxGzhService wxGzhService;
 
 
 
@@ -97,7 +76,7 @@ public class WxNotifyController {
         log.info("微信支付回调数据"+resourceString);
         JSONObject jsonObject = JSONObject.parseObject(resourceString);
         //将回调数据写入数据库, 并成为会员
-        writeNotifyDataToDb(jsonObject);
+        wxOrderService.writeNotifyDataToDb(jsonObject);
         WxNotifyReturnDTO wxNotifyReturnDTO = new WxNotifyReturnDTO();
         wxNotifyReturnDTO.setCode("SUCCESS");
         wxNotifyReturnDTO.setMessage("成功");
@@ -201,69 +180,6 @@ public class WxNotifyController {
 
     }
 
-
-
-
-
-
-    @Transactional
-    public String writeNotifyDataToDb(JSONObject jsonObject) {
-        String outTradeNo = jsonObject.getString("out_trade_no");
-        WxOrder wxOrder = wxOrderService.getByOutTradeNo(outTradeNo);
-        if (wxOrder == null) {
-            throw new CustomException("该订单不存在");
-        }
-        wxOrder.setTransactionId(jsonObject.getString("transaction_id"));
-        JSONObject amount = jsonObject.getJSONObject("amount");
-        wxOrder.setPayerTotal(amount.getInteger("payer_total"));
-        wxOrder.setTotal(amount.getInteger("total"));
-        wxOrder.setCurrency(amount.getString("currency"));
-        wxOrder.setPayerCurrency(amount.getString("payer_currency"));
-        wxOrder.setTradeState(jsonObject.getString("trade_state"));
-        wxOrder.setBankType(jsonObject.getString("bank_type"));
-        DateTime dateTime  = new DateTime(jsonObject.getString("success_time"));
-        wxOrder.setSuccessTime(dateTime.toDate());
-        wxOrder.setTradeStateDesc(jsonObject.getString("trade_state_desc"));
-        wxOrder.setTradeType(jsonObject.getString("trade_type"));
-        wxOrder.setAttach(jsonObject.getString("attach"));
-        JSONObject sceneInfo = jsonObject.getJSONObject("scene_info");
-        if (sceneInfo != null){
-            wxOrder.setDeviceId(sceneInfo.getString("device_id"));
-        }
-        wxOrderService.updateById(wxOrder);
-
-        //成为会员
-        String data = wxOrder.getOrderDataJson();
-        int days;
-        try{
-            days = Integer.valueOf(data);
-        }catch (Exception e){
-            throw new CustomException("参数值转化异常，请检查数据是否为数值类型");
-        }
-        long timeMillis = days*1440*60*1000l;
-        UserInfo userinfo = userInfoService.getOne(new QueryWrapper<UserInfo>().eq("openid", wxOrder.getOpenid()));
-        Date expireTime = userinfo.getExpireTime();
-        if (expireTime == null || expireTime.getTime()< System.currentTimeMillis()){
-            userinfo.setExpireTime(new Date(System.currentTimeMillis()+timeMillis));
-        }else{
-            userinfo.setExpireTime(new Date(expireTime.getTime()+timeMillis));
-        }
-
-        userInfoService.updateById(userinfo);
-
-        //更新上下文中对象状态
-
-
-        //发送模板消息
-        messageTemplateSend(userinfo,wxOrder);
-
-        // 分成
-        wxExtensionIncomeService.addExtensionIncomeBySourceId(wxOrder.getOutTradeNo(),wxOrder.getOpenid(),wxOrder.getTotal());
-
-        return outTradeNo;
-
-    }
-
     private String getSourString(WxpayNotifyDTO wxpayNotifyDTO) throws GeneralSecurityException, IOException {
         AesUtil aesUtil = new AesUtil(wxpayConfig.getV3key().getBytes());
         WxpayNotifyDTO.WxpaySource wxpaySource = wxpayNotifyDTO.getResource();
@@ -271,58 +187,7 @@ public class WxNotifyController {
     }
 
 
-    /**
-     * 发送模板信息
-     * @param userInfo 用户信息
-     * @param wxOrder 订单信息
-     */
-    private void messageTemplateSend(UserInfo userInfo,WxOrder wxOrder){
-
-        //获取tolen
-        String token = wxGzhService.getGzhToken();
-
-        WxMessageTemplate messageTemplate = new WxMessageTemplate();
-        messageTemplate.setTouser(userInfo.getOpenid());
-        messageTemplate.setTemplate_id("d1P87FFAAos_sHteTCA-slkFJesE8xkoDsRImVa58jc");
-        messageTemplate.setUrl("https://jpcj-h5.zzxcx.net");
-        WxGzhMini wxGzhMini = new WxGzhMini();
-        messageTemplate.setMiniprogram(wxGzhMini);
-
-        JSONObject jsonObject = new JSONObject();
-        JSONObject first = new JSONObject();
-        JSONObject keyword1 = new JSONObject();
-        JSONObject keyword2 = new JSONObject();
-        JSONObject keyword3 = new JSONObject();
-        JSONObject keyword4 = new JSONObject();
-        JSONObject keyword5 = new JSONObject();
-        JSONObject remark = new JSONObject();
-        first.put("value","恭喜您开通金牌车教会员成功！");
-        first.put("color","#173177");
-        keyword1.put("value","VIP会员");
-        keyword1.put("color","#173177");
-        keyword2.put("value", userInfo.getNickName());
-        keyword2.put("color","#173177");
-        keyword3.put("value","支付成功");
-        keyword3.put("color","#173177");
-        keyword4.put("value",wxOrder.getTotal()/100);
-        keyword4.put("color","#173177");
-        keyword5.put("value",DateUtil.format(userInfo.getExpireTime(), "yyyy-MM-dd HH:mm"));
-        keyword5.put("color","#173177");
-        remark.put("value","即日起，即可想享受会员特权");
-        remark.put("color","#173177");
-        jsonObject.put("first",first);
-        jsonObject.put("keyword1",keyword1);
-        jsonObject.put("keyword2",keyword2);
-        jsonObject.put("keyword3",keyword3);
-        jsonObject.put("keyword4",keyword4);
-        jsonObject.put("keyword5",keyword5);
-        jsonObject.put("remark",remark);
-        messageTemplate.setData(jsonObject);
-        String result = wxSendService.messageTemplateSend(token,messageTemplate);
-        JSONObject parseObject = JSONObject.parseObject(result);
-        log.info("模板消息：[{}],响应信息：[{}]",messageTemplate,parseObject);
 
-    }
 
 
 

twzd-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -7,7 +7,6 @@ import com.github.wxpay.sdk.WXPayUtil;
 import com.miaxis.TwzdApplication;
 import com.miaxis.common.config.WxPayConfigImpl;
 import com.miaxis.common.config.WxpayConfig;
-import com.miaxis.common.core.domain.entity.UserInfo;
 import com.miaxis.common.utils.XmlUtil;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.question.mapper.QuestionInfoMapper;
@@ -15,6 +14,7 @@ import com.miaxis.question.vo.QuestionInfoExcelTypeVo;
 import com.miaxis.question.vo.QuestionInfoExcelVo;
 import com.miaxis.system.service.ISysUserService;
 import com.miaxis.user.service.IUserInfoService;
+import com.miaxis.wx.service.IWxTicketService;
 import com.miaxis.wx.service.impl.WxGzhServiceImpl;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.poi.hssf.usermodel.*;
@@ -58,6 +58,9 @@ public class NormalTest {
     @Autowired
     IUserInfoService userInfoService;
 
+    @Autowired
+    IWxTicketService wxTicketService;
+
 
 
 
@@ -70,12 +73,7 @@ public class NormalTest {
     @Test
     public void test666() throws Exception {
 
-        UserInfo userInfo = userService.getStudentByOpenId("ovKTX5-FKLF6_sgTtCIXpG_lz3PY");
-        userInfo.setAreaName("");
-        userInfo.setCityName("");
-        userInfo.setSchoolName("");
-        userInfoService.updateById(userInfo);
-
+        wxTicketService.transactionTest();
     }
 
 

twzd-service/src/main/java/com/miaxis/wx/service/IWxOrderService.java

@@ -1,5 +1,6 @@
 package com.miaxis.wx.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.miaxis.wx.domain.WxOrder;
 import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
@@ -23,4 +24,6 @@ public interface IWxOrderService extends IService<WxOrder>{
     String wxwithdrawal(Integer amount) throws Exception;
 
     String wxwithbankdrawal(WxExtractBankDTO amount) throws Exception;
+
+    String writeNotifyDataToDb(JSONObject jsonObject);
 }

twzd-service/src/main/java/com/miaxis/wx/service/IWxTicketService.java

@@ -10,4 +10,6 @@ import com.miaxis.wx.domain.WxTicket;
  * @date 2021/10/28 16:24
  */
 public interface IWxTicketService extends IService<WxTicket> {
+
+    void transactionTest() throws Exception;
 }

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxOrderServiceImpl.java

@@ -1,5 +1,8 @@
 package com.miaxis.wx.service.impl;
 
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.wxpay.sdk.WXPay;
 import com.github.wxpay.sdk.WXPayConfig;
@@ -12,6 +15,11 @@ import com.miaxis.common.exception.CustomException;
 import com.miaxis.common.utils.RSAUtils;
 import com.miaxis.common.utils.SecurityUtils;
 import com.miaxis.common.utils.XmlUtil;
+import com.miaxis.extension.service.IWxExtensionIncomeService;
+import com.miaxis.feign.dto.WxGzhMini;
+import com.miaxis.feign.dto.WxMessageTemplate;
+import com.miaxis.feign.service.IWxSendService;
+import com.miaxis.framework.web.service.TokenService;
 import com.miaxis.system.service.ISysConfigService;
 import com.miaxis.user.service.IUserInfoService;
 import com.miaxis.wx.domain.WxExtract;
@@ -20,16 +28,18 @@ import com.miaxis.wx.dto.QuerySchoolOrderListDTO;
 import com.miaxis.wx.dto.WxExtractBankDTO;
 import com.miaxis.wx.mapper.WxOrderMapper;
 import com.miaxis.wx.service.IWxExtractService;
+import com.miaxis.wx.service.IWxGzhService;
 import com.miaxis.wx.service.IWxOrderService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
+import org.joda.time.DateTime;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.security.PublicKey;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -68,6 +78,15 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     @Autowired
     private RSAUtils rsaUtils;
 
+    @Autowired
+    private IWxSendService wxSendService;
+
+    @Autowired
+    private IWxGzhService wxGzhService;
+
+    @Autowired
+    private IWxExtensionIncomeService wxExtensionIncomeService;
+
     @Value("${app.appid}")
     private String appid;
 
@@ -140,6 +159,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
     }
 
     @Override
+    @Transactional
     public String wxwithbankdrawal(WxExtractBankDTO dto) throws Exception {
         UserInfo student = SecurityUtils.getLoginUser().getStudent();
         UserInfo dbUserInfo = userInfoService.getById(student.getId());
@@ -155,9 +175,7 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         sortMap.put("desc","用户银行卡提现");
 
 
-//        X509Certificate validCertificate = verifier.getValidCertificate();
         String rsa ="RSA/ECB/OAEPWITHSHA-1ANDMGF1PADDING";
-        //PublicKey publicKey = getPublicKey();
 
         // 进行签名服务
 
@@ -193,23 +211,113 @@ public class WxOrderServiceImpl extends ServiceImpl<WxOrderMapper, WxOrder> impl
         return resMap.get("return_msg");
     }
 
-    private PublicKey getPublicKey() throws Exception {
-        Map<String, String> sortMap = new TreeMap<String, String>();
-        sortMap.put("mch_id",wxpayConfig.getMerchantId());
-        sortMap.put("nonce_str", RandomStringUtils.randomAlphanumeric(32));
-        sortMap.put("sign_type","MD5");
+    @Override
+    @Transactional
+    public String writeNotifyDataToDb(JSONObject jsonObject) {
+        //更新订单
+        String outTradeNo = jsonObject.getString("out_trade_no");
+        WxOrder wxOrder = this.getByOutTradeNo(outTradeNo);
+        if (wxOrder == null) {
+            throw new CustomException("该订单不存在");
+        }
+        wxOrder.setTransactionId(jsonObject.getString("transaction_id"));
+        JSONObject amount = jsonObject.getJSONObject("amount");
+        wxOrder.setPayerTotal(amount.getInteger("payer_total"));
+        wxOrder.setTotal(amount.getInteger("total"));
+        wxOrder.setCurrency(amount.getString("currency"));
+        wxOrder.setPayerCurrency(amount.getString("payer_currency"));
+        wxOrder.setTradeState(jsonObject.getString("trade_state"));
+        wxOrder.setBankType(jsonObject.getString("bank_type"));
+        DateTime dateTime  = new DateTime(jsonObject.getString("success_time"));
+        wxOrder.setSuccessTime(dateTime.toDate());
+        wxOrder.setTradeStateDesc(jsonObject.getString("trade_state_desc"));
+        wxOrder.setTradeType(jsonObject.getString("trade_type"));
+        wxOrder.setAttach(jsonObject.getString("attach"));
+        JSONObject sceneInfo = jsonObject.getJSONObject("scene_info");
+        if (sceneInfo != null){
+            wxOrder.setDeviceId(sceneInfo.getString("device_id"));
+        }
+        this.updateById(wxOrder);
+
+        //成为会员
+        String data = wxOrder.getOrderDataJson();
+        int days;
+        try{
+            days = Integer.valueOf(data);
+        }catch (Exception e){
+            throw new CustomException("参数值转化异常，请检查数据是否为数值类型");
+        }
+        long timeMillis = days*1440*60*1000l;
+        UserInfo userinfo = userInfoService.getOne(new QueryWrapper<UserInfo>().eq("openid", wxOrder.getOpenid()));
+        Date expireTime = userinfo.getExpireTime();
+        if (expireTime == null || expireTime.getTime()< System.currentTimeMillis()){
+            userinfo.setExpireTime(new Date(System.currentTimeMillis()+timeMillis));
+        }else{
+            userinfo.setExpireTime(new Date(expireTime.getTime()+timeMillis));
+        }
+        userInfoService.updateById(userinfo);
 
+        //发送模板消息
+        messageTemplateSend(userinfo,wxOrder);
 
-        WXPayConfig config = new WxPayConfigImpl();
-        String sign = WXPayUtil.generateSignature(sortMap, config.getKey(), WXPayConstants.SignType.MD5);
-        sortMap.put("sign", sign);
-        WXPay pay = new WXPay(config);
+        // 分成
+        wxExtensionIncomeService.addExtensionIncomeBySourceId(wxOrder.getOutTradeNo(),wxOrder.getOpenid(),wxOrder.getTotal());
 
-        String url = "https://fraud.mch.weixin.qq.com/risk/getpublickey";
-        Map<String, String> resMap;
-        String xmlStr = pay.requestWithCert(url, sortMap, config.getHttpConnectTimeoutMs(), config.getHttpReadTimeoutMs());
-        resMap = XmlUtil.xmlToMap(xmlStr);
-        return  null;
+        return outTradeNo;
+    }
+
+    /**
+     * 发送模板信息
+     * @param userInfo 用户信息
+     * @param wxOrder 订单信息
+     */
+    private void messageTemplateSend(UserInfo userInfo,WxOrder wxOrder){
+
+        //获取tolen
+        String token = wxGzhService.getGzhToken();
+
+        WxMessageTemplate messageTemplate = new WxMessageTemplate();
+        messageTemplate.setTouser(userInfo.getOpenid());
+        messageTemplate.setTemplate_id("d1P87FFAAos_sHteTCA-slkFJesE8xkoDsRImVa58jc");
+        messageTemplate.setUrl("https://jpcj-h5.zzxcx.net");
+        WxGzhMini wxGzhMini = new WxGzhMini();
+        messageTemplate.setMiniprogram(wxGzhMini);
+
+        JSONObject jsonObject = new JSONObject();
+        JSONObject first = new JSONObject();
+        JSONObject keyword1 = new JSONObject();
+        JSONObject keyword2 = new JSONObject();
+        JSONObject keyword3 = new JSONObject();
+        JSONObject keyword4 = new JSONObject();
+        JSONObject keyword5 = new JSONObject();
+        JSONObject remark = new JSONObject();
+        first.put("value","恭喜您开通金牌车教会员成功！");
+        first.put("color","#173177");
+        keyword1.put("value","VIP会员");
+        keyword1.put("color","#173177");
+        keyword2.put("value", userInfo.getNickName());
+        keyword2.put("color","#173177");
+        keyword3.put("value","支付成功");
+        keyword3.put("color","#173177");
+        keyword4.put("value",wxOrder.getTotal()/100);
+        keyword4.put("color","#173177");
+        keyword5.put("value", DateUtil.format(userInfo.getExpireTime(), "yyyy-MM-dd HH:mm"));
+        keyword5.put("color","#173177");
+        remark.put("value","即日起，即可想享受会员特权");
+        remark.put("color","#173177");
+        jsonObject.put("first",first);
+        jsonObject.put("keyword1",keyword1);
+        jsonObject.put("keyword2",keyword2);
+        jsonObject.put("keyword3",keyword3);
+        jsonObject.put("keyword4",keyword4);
+        jsonObject.put("keyword5",keyword5);
+        jsonObject.put("remark",remark);
+        messageTemplate.setData(jsonObject);
+        String result = wxSendService.messageTemplateSend(token,messageTemplate);
+        JSONObject parseObject = JSONObject.parseObject(result);
+        log.info("模板消息：[{}],响应信息：[{}]",messageTemplate,parseObject);
 
     }
+
+
 }

twzd-service/src/main/java/com/miaxis/wx/service/impl/WxTicketServiceImpl.java

@@ -6,6 +6,7 @@ import com.miaxis.wx.mapper.WxTicketMapper;
 import com.miaxis.wx.service.IWxTicketService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 /**
  * 微信推广二维码Service业务层处理
@@ -19,4 +20,14 @@ public class WxTicketServiceImpl extends ServiceImpl<WxTicketMapper, WxTicket> i
 
     private final WxTicketMapper wxTicketMapper;
 
+    @Override
+    @Transactional
+    public void transactionTest() throws Exception {
+        WxTicket wxTicket=  new WxTicket();
+        wxTicket.setMediaId("555");
+        this.save(wxTicket);
+//        String s= null;
+//        s.length();
+
+    }
 }