From b67cb476a3de3eb720bc4c295e8fcd9c29825df7 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Tue, 23 Jan 2024 02:07:21 +0800
Subject: [PATCH] fix
---
src/test/java/cc/mrbird/febs/ProfitTest.java | 243 +++++++++++++++++++++++++++++++++++-------------
1 files changed, 177 insertions(+), 66 deletions(-)
diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java
index d03f197..9ee9405 100644
--- a/src/test/java/cc/mrbird/febs/ProfitTest.java
+++ b/src/test/java/cc/mrbird/febs/ProfitTest.java
@@ -1,34 +1,40 @@
package cc.mrbird.febs;
-import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.enumerates.DataDictionaryEnum;
import cc.mrbird.febs.common.enumerates.FlowTypeEnum;
import cc.mrbird.febs.common.enumerates.MoneyFlowTypeEnum;
-import cc.mrbird.febs.common.enumerates.OrderStatusEnum;
+import cc.mrbird.febs.common.exception.FebsException;
import cc.mrbird.febs.common.utils.HttpCurlUtil;
import cc.mrbird.febs.common.utils.MallUtils;
import cc.mrbird.febs.common.utils.RedisUtils;
-import cc.mrbird.febs.mall.dto.AdminLeaderAddFenceDto;
-import cc.mrbird.febs.mall.dto.ApiLeaderRefundOrderDto;
+import cc.mrbird.febs.mall.dto.MallMemberCouponDto;
import cc.mrbird.febs.mall.entity.*;
import cc.mrbird.febs.mall.mapper.*;
import cc.mrbird.febs.mall.service.*;
-import cc.mrbird.febs.pay.model.WxGenerateQrCodeDto;
+import cc.mrbird.febs.mall.vo.MallMemberCouponVo;
+import cc.mrbird.febs.pay.model.BrandWCPayRequestData;
+import cc.mrbird.febs.pay.model.HeaderDto;
import cc.mrbird.febs.pay.service.IXcxPayService;
+import cc.mrbird.febs.pay.service.WxFaPiaoService;
import cc.mrbird.febs.pay.util.WechatConfigure;
import cc.mrbird.febs.rabbit.consumer.AgentConsumer;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.ObjectUtil;
import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import okhttp3.HttpUrl;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.methods.GetMethod;
+import org.apache.commons.httpclient.methods.PostMethod;
+import org.apache.commons.httpclient.methods.RequestEntity;
+import org.apache.commons.httpclient.methods.StringRequestEntity;
import org.apache.http.HttpEntity;
import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -36,6 +42,8 @@
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.core.io.ResourceLoader;
import org.springframework.web.client.RestTemplate;
import javax.annotation.Resource;
@@ -43,6 +51,7 @@
import java.math.BigDecimal;
import java.net.URLConnection;
import java.nio.charset.Charset;
+import java.security.KeyPair;
import java.util.*;
import java.io.ByteArrayOutputStream;
import java.io.InputStream;
@@ -86,11 +95,89 @@
public void thankfulProfit() {
memberProfitService.thankfulProfit(new Date());
}
+ @Autowired
+ private MallMemberCouponMapper mallMemberCouponMapper;
+ @Autowired
+ private MallGoodsMapper mallGoodsMapper;
+ @Autowired
+ private CouponGoodsMapper couponGoodsMapper;
+ @Autowired
+ private WxFaPiaoService wxFaPiaoService;
+ @Autowired
+ ResourceLoader resourceLoader;
+ @Test
+ public void rankProfit() throws IOException {
+// System.out.println(new ClassPathResource("wxP12/apiclient_cert.p12").getFile().exists());
+// System.out.println(new File("src/main/resources/wxP12/apiclient_cert.p12").exists());
+//
+// InputStream inputStream = new FileInputStream(file);
+// System.out.println(resourceLoader.getResource("classpath:/wxP12/apiclient_cert.p12").exists());
+ KeyPair privateKey = wxFaPiaoService.getPrivateKey();
+ HeaderDto headerDto = new HeaderDto();
+ headerDto.setCallback_url("https://api.blnka.cn/api/xcxPay/fapiaoCallBack");
+ headerDto.setShow_fapiao_cell(true);
+ String parseObj = JSONUtil.parseObj(headerDto).toString();
+ String baseUrl = "https://api.mch.weixin.qq.com";
+ String canonicalUrl = "/v3/new-tax-control-fapiao/merchant/development-config";
+ String postStr = wxFaPiaoService.createAuthorization(
+ "POST",
+ canonicalUrl,
+ parseObj,
+ privateKey
+
+ );
+ // 创建httppost
+ try {
+ HttpClient httpClient = new HttpClient();
+ PostMethod post = new PostMethod("https://api.mch.weixin.qq.com/v3/new-tax-control-fapiao/merchant/development-config");
+ post.setRequestHeader("Accept", "application/json");
+ post.setRequestHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.106 Safari/537.36");
+ post.setRequestHeader("Content-Type", "application/json; charset=UTF-8");
+ post.setRequestHeader("Connection", "keep-alive");
+ post.setRequestHeader("Authorization", "WECHATPAY2-SHA256-RSA2048 "+postStr);
+ RequestEntity entity = new StringRequestEntity(parseObj, "text/html", "utf-8");
+ post.setRequestEntity(entity);
+ httpClient.executeMethod(post);
+ String responseBodyAsString = post.getResponseBodyAsString();
+ cn.hutool.json.JSONObject maps = JSONUtil.parseObj(responseBodyAsString);
+ System.out.println(maps);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ }
@Test
- public void rankProfit() {
- memberProfitService.rankProfit();
+ public void rankProfit2() throws IOException {
+ KeyPair privateKey = wxFaPiaoService.getPrivateKey();
+ String baseUrl = "https://api.mch.weixin.qq.com";
+ String canonicalUrl = "/v3/new-tax-control-fapiao/merchant/development-config";
+ String postStr = wxFaPiaoService.createAuthorization(
+ "GET",
+ canonicalUrl,
+ "",
+ privateKey
+
+ );
+ try {
+ HttpClient httpClient = new HttpClient();
+ GetMethod method = new GetMethod(baseUrl+canonicalUrl);
+ method.setRequestHeader("Accept", "application/json");
+ method.setRequestHeader("User-Agent", "Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/51.0.2704.106 Safari/537.36");
+ method.setRequestHeader("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
+ method.setRequestHeader("Connection", "keep-alive");
+ method.setRequestHeader("Authorization", "WECHATPAY2-SHA256-RSA2048 "+postStr);
+ httpClient.executeMethod(method);
+ System.out.println(method);
+ String responseBodyAsString = method.getResponseBodyAsString();
+ cn.hutool.json.JSONObject maps = JSONUtil.parseObj(responseBodyAsString);
+ System.out.println(maps);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
}
+
@Autowired
private MallOrderInfoMapper mallOrderInfoMapper;
@@ -201,8 +288,6 @@
@Autowired
private IXcxPayService iXcxPayService;
@Autowired
- private MallGoodsMapper mallGoodsMapper;
- @Autowired
private IAdminMallTeamLeaderService iAdminMallTeamLeaderService;
@Test
@@ -219,7 +304,7 @@
// trackServiceInfo("e024c63342930addc57189c8608cdb01",null);
// String e024c63342930addc57189c8608cdb01 = trackServiceDel("e024c63342930addc57189c8608cdb01", "792477");
// System.out.println(e024c63342930addc57189c8608cdb01);
- String ss = fenceDel("95ede7157929f5f6b6c758971be924b1", "795278","798477");
+ String ss = fenceDel("95ede7157929f5f6b6c758971be924b1", "795278","795554");
System.out.println(ss);
}
@@ -411,62 +496,88 @@
@Test
public void qrcode(){
- MallMember member = mallMemberMapper.selectById(58L);
- Long id = 320L;
+ MallMember member = mallMemberMapper.selectById(402L);
+
+// ApiRechargeWalletDto apiRechargeWalletDto = new ApiRechargeWalletDto();
+// apiRechargeWalletDto.setAmount(new BigDecimal(1));
+// apiRechargeWalletDto.setMemberId(402L);
+// BrandWCPayRequestData brandWCPayRequestData = null;
+// try {
+// brandWCPayRequestData = iXcxPayService.startRechargeWallet(apiRechargeWalletDto);
+// } catch (Exception e) {
+// throw new FebsException("支付失败");
+// }
+// String wxResultStr = JSONUtil.toJsonStr(brandWCPayRequestData);
+// String payResultStr = brandWCPayRequestData.getPrepay_id();
+// Map<String, Object> map = new HashMap<>();
+// map.put("orderInfo", payResultStr);
+// map.put("wxResultStr", wxResultStr);
+
+ Long id = 345417L;
MallOrderInfo mallOrderInfo = mallOrderInfoMapper.selectById(id);
- if(ObjectUtil.isEmpty(mallOrderInfo)){
+ BrandWCPayRequestData brandWCPayRequestData = null;
+ try {
+ brandWCPayRequestData = iXcxPayService.startPayment(mallOrderInfo);
+ } catch (Exception e) {
+ throw new FebsException("支付失败");
}
- Integer status = mallOrderInfo.getStatus();
- if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
- }
- Integer deliveryState = mallOrderInfo.getDeliveryState();
- if(1 != deliveryState){
- }
- //根据子订单生成退款记录
- List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
- if(CollUtil.isEmpty(mallOrderItemList)){
- }
- for(MallOrderItem mallOrderItem : mallOrderItemList){
- QueryWrapper<MallRefundEntity> objectQueryWrapper = new QueryWrapper<>();
- objectQueryWrapper.eq("member_id",member.getId());
- objectQueryWrapper.eq("order_id",mallOrderInfo.getId());
- objectQueryWrapper.eq("item_id",mallOrderItem.getId());
- MallRefundEntity mallRefund = mallRefundMapper.selectOne(objectQueryWrapper);
- MallRefundEntity mallRefundEntity = new MallRefundEntity();
- if(ObjectUtil.isEmpty(mallRefund)){
- mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+mallOrderItem.getId());
- mallRefundEntity.setMemberId(member.getId());
- mallRefundEntity.setOrderId(mallOrderInfo.getId());
- mallRefundEntity.setItemId(mallOrderItem.getId());
- if("余额支付".equals(mallOrderInfo.getPayMethod())){
- mallRefundEntity.setType(3);
- }else if("微信支付".equals(mallOrderInfo.getPayMethod())){
- mallRefundEntity.setType(1);
- }else{
- mallRefundEntity.setType(3);
- }
- mallRefundEntity.setState(3);
- mallRefundEntity.setAmount(mallOrderItem.getAmount());
- mallRefundMapper.insert(mallRefundEntity);
- }else{
- if(mallRefund.getState() == 2){
- mallRefundEntity.setId(mallRefund.getId());
- mallRefundEntity.setRefundNo(mallRefund.getRefundNo());
- mallRefundEntity.setMemberId(mallRefund.getMemberId());
- mallRefundEntity.setOrderId(mallRefund.getOrderId());
- mallRefundEntity.setItemId(mallRefund.getItemId());
- mallRefundEntity.setType(mallRefund.getType());
- mallRefundEntity.setState(3);
- mallRefundEntity.setAmount(mallRefund.getAmount());
- mallRefundMapper.updateById(mallRefundEntity);
- }
- }
- ApiLeaderRefundOrderDto apiLeaderRefundOrderDto = new ApiLeaderRefundOrderDto();
- apiLeaderRefundOrderDto.setOrderId(mallOrderInfo.getId());
- apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId());
- apiLeaderRefundOrderDto.setAgreeState(1);
- iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
- }
+ String s = JSONUtil.toJsonStr(brandWCPayRequestData);
+ String prepay_id = brandWCPayRequestData.getPrepay_id();
+
+
+// if(ObjectUtil.isEmpty(mallOrderInfo)){
+// }
+// Integer status = mallOrderInfo.getStatus();
+// if(OrderStatusEnum.WAIT_SHIPPING.getValue() != status){
+// }
+// Integer deliveryState = mallOrderInfo.getDeliveryState();
+// if(1 != deliveryState){
+// }
+// //根据子订单生成退款记录
+// List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectListByOrderId(id);
+// if(CollUtil.isEmpty(mallOrderItemList)){
+// }
+// for(MallOrderItem mallOrderItem : mallOrderItemList){
+// QueryWrapper<MallRefundEntity> objectQueryWrapper = new QueryWrapper<>();
+// objectQueryWrapper.eq("member_id",member.getId());
+// objectQueryWrapper.eq("order_id",mallOrderInfo.getId());
+// objectQueryWrapper.eq("item_id",mallOrderItem.getId());
+// MallRefundEntity mallRefund = mallRefundMapper.selectOne(objectQueryWrapper);
+// MallRefundEntity mallRefundEntity = new MallRefundEntity();
+// if(ObjectUtil.isEmpty(mallRefund)){
+// mallRefundEntity.setRefundNo(mallOrderInfo.getOrderNo()+"_RITEM"+mallOrderItem.getId());
+// mallRefundEntity.setMemberId(member.getId());
+// mallRefundEntity.setOrderId(mallOrderInfo.getId());
+// mallRefundEntity.setItemId(mallOrderItem.getId());
+// if("余额支付".equals(mallOrderInfo.getPayMethod())){
+// mallRefundEntity.setType(3);
+// }else if("微信支付".equals(mallOrderInfo.getPayMethod())){
+// mallRefundEntity.setType(1);
+// }else{
+// mallRefundEntity.setType(3);
+// }
+// mallRefundEntity.setState(3);
+// mallRefundEntity.setAmount(mallOrderItem.getAmount());
+// mallRefundMapper.insert(mallRefundEntity);
+// }else{
+// if(mallRefund.getState() == 2){
+// mallRefundEntity.setId(mallRefund.getId());
+// mallRefundEntity.setRefundNo(mallRefund.getRefundNo());
+// mallRefundEntity.setMemberId(mallRefund.getMemberId());
+// mallRefundEntity.setOrderId(mallRefund.getOrderId());
+// mallRefundEntity.setItemId(mallRefund.getItemId());
+// mallRefundEntity.setType(mallRefund.getType());
+// mallRefundEntity.setState(3);
+// mallRefundEntity.setAmount(mallRefund.getAmount());
+// mallRefundMapper.updateById(mallRefundEntity);
+// }
+// }
+// ApiLeaderRefundOrderDto apiLeaderRefundOrderDto = new ApiLeaderRefundOrderDto();
+// apiLeaderRefundOrderDto.setOrderId(mallOrderInfo.getId());
+// apiLeaderRefundOrderDto.setItemId(mallOrderItem.getId());
+// apiLeaderRefundOrderDto.setAgreeState(1);
+// iApiMallTeamLeaderService.leaderRefundOrder(apiLeaderRefundOrderDto);
+// }
}
/**
--
Gitblit v1.9.1