From aa5feb8f990bc4f01b1a1e15cac41458f3c2179a Mon Sep 17 00:00:00 2001 From: KKSU <15274802129@163.com> Date: Thu, 11 Apr 2024 17:25:32 +0800 Subject: [PATCH] 检测报告 --- src/test/java/cc/mrbird/febs/ProfitTest.java | 489 +++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 423 insertions(+), 66 deletions(-) diff --git a/src/test/java/cc/mrbird/febs/ProfitTest.java b/src/test/java/cc/mrbird/febs/ProfitTest.java index ed8ba71..b7b477c 100644 --- a/src/test/java/cc/mrbird/febs/ProfitTest.java +++ b/src/test/java/cc/mrbird/febs/ProfitTest.java @@ -1,41 +1,61 @@ 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.AppContants; 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.MallGoodsListVo; +import cc.mrbird.febs.mall.vo.MallMemberCouponVo; +import cc.mrbird.febs.pay.model.*; import cc.mrbird.febs.pay.service.IXcxPayService; +import cc.mrbird.febs.pay.service.WxFaPiaoService; +import cc.mrbird.febs.pay.util.JCEUtil; 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.JSONArray; import cn.hutool.json.JSONUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.wechat.pay.contrib.apache.httpclient.auth.AutoUpdateCertificatesVerifier; +import com.wechat.pay.contrib.apache.httpclient.auth.PrivateKeySigner; +import com.wechat.pay.contrib.apache.httpclient.auth.WechatPay2Credentials; +import com.wechat.pay.contrib.apache.httpclient.notification.NotificationHandler; +import com.wechat.pay.contrib.apache.httpclient.util.AesUtil; +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.HttpPatch; import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; +import org.apache.http.message.BasicNameValuePair; +import org.apache.http.util.EntityUtils; 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.util.Base64Utils; import org.springframework.web.client.RestTemplate; import javax.annotation.Resource; @@ -43,6 +63,12 @@ import java.math.BigDecimal; import java.net.URLConnection; import java.nio.charset.Charset; +import java.nio.charset.StandardCharsets; +import java.security.*; +import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.util.*; import java.io.ByteArrayOutputStream; import java.io.InputStream; @@ -86,11 +112,250 @@ 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() { - memberProfitService.rankProfit(); + public void redisTest() throws IOException {//配置开发选项 + String obj = redisUtils.getString("mall_goods_json");//获取JSONARRAY字符串对象 + System.out.println(obj); + JSONArray jsonArray = JSONUtil.parseArray(obj);//转换成JSONARRAY对象 + List<MallGoodsListVo> mallGoodsListVos = JSONUtil.toList(jsonArray, MallGoodsListVo.class);//转换成对象集合 + System.out.println(mallGoodsListVos.size()); + } + @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()); + PrivateKey privateKey = wxFaPiaoService.getPrivateKeyV3(); + HeaderDto headerDto = new HeaderDto(); + headerDto.setCallback_url("https://api.blnka.cn/api/xcxPay/fapiaoCallBack"); + headerDto.setShow_fapiao_cell(false); + 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 = null; + try { + postStr = wxFaPiaoService.createAuthorization( + "PATCH", + baseUrl+canonicalUrl, + parseObj, + privateKey + ); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + + String token = AppContants.FP_TOKEN_HEADER_TYPE+postStr; + System.out.println("WECHATPAY2-SHA256-RSA2048 "+postStr); + String s = wxFaPiaoService.sendPatch(baseUrl + canonicalUrl, parseObj, token); + System.out.println(s); + } + + @Test + public void rankProfit03() throws IOException {//创建电子发票卡券模板 + FPCardTemplateDto fpCardTemplateDto = new FPCardTemplateDto(); + fpCardTemplateDto.setCard_appid("wxad2fdb2fcad10fb2"); + + FPCardTemplateInformationDto fpCardTemplateInformationDto = new FPCardTemplateInformationDto(); + fpCardTemplateInformationDto.setLogo_url("http://mmbiz.qpic.cn/mmbiz/iaL1LJM1mF9aRKPZJkmG8xXhiaHqkKSVMMWeN3hLut7X7hicFNjakmxibMLGWpXrEXB33367o7zHN0CwngnQY7zb7g/0"); + fpCardTemplateInformationDto.setPayee_name("发票测试"); + + FPCardTemplateCustomCellDto fpCardTemplateCustomCellDto = new FPCardTemplateCustomCellDto(); + fpCardTemplateCustomCellDto.setWords("电子发票"); + fpCardTemplateCustomCellDto.setDescription("查看发票"); + fpCardTemplateCustomCellDto.setJump_url("http://www.qq.com"); + fpCardTemplateCustomCellDto.setMiniprogram_path("gh_86a091e50ad4@app"); + fpCardTemplateCustomCellDto.setMiniprogram_user_name("pages/xxxPage"); + fpCardTemplateInformationDto.setCustom_cell(fpCardTemplateCustomCellDto); + + fpCardTemplateDto.setCard_template_information(fpCardTemplateInformationDto); + + String parseObj = JSONUtil.parseObj(fpCardTemplateDto).toString(); + System.out.println(parseObj); + String baseUrl = "https://api.mch.weixin.qq.com"; + String canonicalUrl = "/v3/new-tax-control-fapiao/card-template"; + PrivateKey privateKey = wxFaPiaoService.getPrivateKeyV3(); + String postStr = null; + try { + postStr = wxFaPiaoService.createAuthorization( + "POST", + baseUrl+canonicalUrl, + parseObj, + privateKey + ); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + String token = AppContants.FP_TOKEN_HEADER_TYPE+postStr; + + System.out.println("WECHATPAY2-SHA256-RSA2048 "+postStr); + String s = wxFaPiaoService.sendPost(baseUrl + canonicalUrl, parseObj, "WECHATPAY2-SHA256-RSA2048 "+postStr); + System.out.println(s); + } + + + + @Test + public void rankProfit04() throws IOException {//获取用户填写的抬头 + //初始化请求参数 + Map<String, Object> params = new HashMap<>(); + params.put("scene","WITH_WECHATPAY"); + params.put("fapiao_apply_id","4200002059202401191880748568"); + + String baseUrl = "https://api.mch.weixin.qq.com"; + String canonicalUrl = "/v3/new-tax-control-fapiao/user-title"; + + String urlparm = baseUrl+canonicalUrl;//有参数的get请求,加密是需要把参数加载进去URL + List<BasicNameValuePair> parameters = new ArrayList<>(); + for (Map.Entry<String, Object> entry : params.entrySet()) { + parameters.add(new BasicNameValuePair(entry.getKey(), entry.getValue().toString())); + } + StringBuilder dataparm = new StringBuilder(); + params.forEach((k, v) -> dataparm.append("&" + k + "=" + v)); + String string = dataparm.toString(); + if (!"".equals(string)) { + urlparm = baseUrl+canonicalUrl + "?" + dataparm.substring(1); + } + PrivateKey privateKey = wxFaPiaoService.getPrivateKeyV3(); + String postStr = null; + try { + postStr = wxFaPiaoService.createAuthorization( + "GET", + urlparm, + "", + privateKey + ); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + String s = wxFaPiaoService.sendGet(baseUrl+canonicalUrl, params, "WECHATPAY2-SHA256-RSA2048 "+postStr); + System.out.println(s); + } + + @Test + public void rankProfit2() throws IOException {//查询配置开发选项 + PrivateKey privateKey = wxFaPiaoService.getPrivateKeyV3(); + String baseUrl = "https://api.mch.weixin.qq.com"; + String canonicalUrl = "/v3/new-tax-control-fapiao/merchant/development-config"; + String postStr = null; + try { + postStr = wxFaPiaoService.createAuthorization( + "GET", + baseUrl+canonicalUrl, + "", + privateKey + + ); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + System.out.println("WECHATPAY2-SHA256-RSA2048"+postStr); + String s = wxFaPiaoService.sendGet(baseUrl + canonicalUrl, new HashMap<>(), "WECHATPAY2-SHA256-RSA2048 "+postStr); + + System.out.println(s); +// 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(); +// } + + } + + @Test + public void rankProfit2_01() throws IOException, ParseException, GeneralSecurityException {//获取平台证书 + JCEUtil.removeCryptographyRestrictions(); + SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss"); + PrivateKey privateKey = wxFaPiaoService.getPrivateKeyV3(); + String baseUrl = "https://api.mch.weixin.qq.com"; + String canonicalUrl = "/v3/certificates"; + String postStr = null; + try { + postStr = wxFaPiaoService.createAuthorization( + "GET", + baseUrl+canonicalUrl, + "", + privateKey + + ); + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + String responseBodyAsString = wxFaPiaoService.sendGet(baseUrl + canonicalUrl, new HashMap<>(), "WECHATPAY2-SHA256-RSA2048 "+postStr); + //完成签名并执行请求 + X509Certificate x509Certificate = null; + try { + cn.hutool.json.JSONObject maps = JSONUtil.parseObj(responseBodyAsString); + System.out.println(maps); + + FPCertificateVo certificateVo = com.alibaba.fastjson.JSONObject.parseObject(responseBodyAsString, FPCertificateVo.class); + for (FPCertificates certificates : certificateVo.getData()) { + if (format.parse(certificates.getEffective_time()).before(new Date()) + && format.parse(certificates.getExpire_time()).after(new Date())) { + FPEncryptCertificate encrypt_certificate = certificates.getEncrypt_certificate(); + //解密 + AesUtil aesUtil = new AesUtil("daL341aN5orDt13puXadsAf2rpuX12v3".getBytes("utf-8")); + String pulicKey = aesUtil.decryptToString( + encrypt_certificate.getAssociated_data().getBytes("utf-8"), + encrypt_certificate.getNonce().getBytes("utf-8"), + encrypt_certificate.getCiphertext()); + //获取平台证书 + final CertificateFactory cf = CertificateFactory.getInstance("X509"); + + ByteArrayInputStream inputStream = new ByteArrayInputStream(pulicKey.getBytes(StandardCharsets.UTF_8)); + + x509Certificate = (X509Certificate) cf.generateCertificate(inputStream); + System.out.println(x509Certificate); + } + } + } catch (IOException e) { + e.printStackTrace(); + } + String timestamp = "1705548628"; + String nonce = "sJBCGwYIM8WFJCpTE3gDGifC6VOyrPFY"; + String body = "{\"id\":\"f23942b4-b128-56ef-9172-2da8204b5159\",\"create_time\":\"2024-01-18T11:30:28+08:00\",\"resource_type\":\"encrypt-resource\",\"event_type\":\"FAPIAO.USER_APPLIED\",\"summary\":\"用户已申请开票\",\"resource\":{\"original_type\":\"fapiao\",\"algorithm\":\"AEAD_AES_256_GCM\",\"ciphertext\":\"X7XjgHrepsnVpFqNgjl9EfRbJIdMUf15izFrtnvEf7So3SWlg6CFNofcQAJE+iL1XfkFk7DNNW0rILNbY1cGWGlAlKbbPhv5SFEakZVe9GZsSTd4EC5zTk9D6g+FTS6EQNxCkj4ut2WyYaSSqJjHgYaqdKzLNPSTGRVQnynafFE=\",\"associated_data\":\"fapiao\",\"nonce\":\"X7daAHdejNsm\"}}"; + Map<String, Object> requestBody = JSONUtil.parseObj(body); + String signature = "WECHATPAY/SIGNTEST/9WwfXW/noMdzDPcOrFD51Bf5YIThXLTtLCl5hoGlSfIBdY2UpE+5eHLs0XyF7y2cQc4OlzTzDDxSMTp/p/8ZenE2hMBaQjxVrdbTtrOLA1h13/WjCNaTr1URTqQ5+IF5bLCxAW8BmZ0jEqpmI/HYR3wdK8/7W91c1zfKODYgkvJzxFzd8OWi2GtELE5tLamkOLyb0GEcsGww2DUOypO5HjNyITgsy9R00w3OH92UInCD8Z6c5BAsQNySqFK8N52y38AlIWTtKROHmJtu+kHbt+nMOU0kbB5bZcPAptsnVYpp9KMmjMrmyjiKtHZb2TGIWiN/L+bgceyN3g=="; + //构造验签名串 + String signatureStr = timestamp + "\n" + nonce + "\n" + com.alibaba.fastjson.JSONObject.toJSONString(requestBody) + "\n"; + System.out.println(signature.length()); + System.out.println(signature); + System.out.println(signatureStr.length()); + System.out.println(signatureStr); + // 加载SHA256withRSA签名器 + Signature signer = Signature.getInstance("SHA256withRSA"); + // 用微信平台公钥对签名器进行初始化(调上一节中的获取平台证书方法) + signer.initVerify(x509Certificate); + // 把我们构造的验签名串更新到签名器中 + signer.update(signatureStr.getBytes(StandardCharsets.UTF_8)); + // 把请求头中微信服务器返回的签名用Base64解码 并使用签名器进行验证 + boolean result = signer.verify(Base64Utils.decodeFromString(signature)); + System.out.println(result); + } + @Autowired private MallOrderInfoMapper mallOrderInfoMapper; @@ -201,8 +466,6 @@ @Autowired private IXcxPayService iXcxPayService; @Autowired - private MallGoodsMapper mallGoodsMapper; - @Autowired private IAdminMallTeamLeaderService iAdminMallTeamLeaderService; @Test @@ -216,8 +479,70 @@ // FebsResponse febsResponse = iXcxPayService.generateQrCode(wxGenerateQrCodeDto); // String data = febsResponse.get("data").toString(); // System.out.println(data); - trackServiceInfo("e024c63342930addc57189c8608cdb01",null); +// trackServiceInfo("e024c63342930addc57189c8608cdb01",null); +// String e024c63342930addc57189c8608cdb01 = trackServiceDel("e024c63342930addc57189c8608cdb01", "792477"); +// System.out.println(e024c63342930addc57189c8608cdb01); + String ss = fenceDel("95ede7157929f5f6b6c758971be924b1", "795278","795554"); + System.out.println(ss); } + + //电子围栏删除 + public String fenceDel(String gaodeKey, String sid,String fenceId) { + String url = "https://tsapi.amap.com/v1/track/geofence/delete?key="+gaodeKey+"&sid="+sid+"&gfids="+fenceId; + HttpPost httpPost = new HttpPost(url); + Map<String,String> map = new HashMap<>(); + map.put("key",gaodeKey); + map.put("sid",sid); + map.put("gfids",fenceId); + String param= JSON.toJSONString(map); + String result = null; + try { + result = HttpCurlUtil.sendPostHttp(url, param); + } catch (IOException e) { + e.printStackTrace(); + } + cn.hutool.json.JSONObject maps = JSONUtil.parseObj(result); + System.out.println(maps); + String errcode = maps.get("errcode").toString(); + if(!"10000".equals(errcode)){ + return "fail"; + }else{ + return maps.toString(); + } + } + //服务删除 + public String trackServiceDel(String gaodeKey, String sid) { + String url = "https://tsapi.amap.com/v1/track/service/delete?key="+gaodeKey+"&sid="+sid; + HttpPost httpPost = new HttpPost(url); + Map<String,String> map = new HashMap<>(); + map.put("key",gaodeKey); + map.put("sid",sid); + String param= JSON.toJSONString(map); + String result = null; + try { + result = HttpCurlUtil.sendPostHttp(url, param); + } catch (IOException e) { + e.printStackTrace(); + } + cn.hutool.json.JSONObject maps = JSONUtil.parseObj(result); + System.out.println(maps); + String errcode = maps.get("errcode").toString(); + if(!"10000".equals(errcode)){ + return "fail"; + }else{ + return maps.toString(); + } +// String str2 = maps.get("data").toString(); +// cn.hutool.json.JSONObject maps2 = JSONUtil.parseObj(str2); +// String serviceId = maps2.get("sid").toString(); +// if(null!=serviceId&&!"".equals(serviceId)){ +// return serviceId; +// }else{ +// return "fail"; +// } + } + + public String trackServiceInfo(String gaodeKey, String serviceName) { String url = "https://tsapi.amap.com/v1/track/service/list"; HttpPost httpPost = new HttpPost(url); @@ -349,62 +674,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); +// } } /** @@ -616,4 +967,10 @@ BigDecimal amount = new BigDecimal("0.15").setScale(2,BigDecimal.ROUND_DOWN); System.out.println(amount); } + + @Test + public void aaaTest() { +// agentConsumer.vipLevelUp(133L); + agentConsumer.getScoreMsg(217L); + } } -- Gitblit v1.9.1