autumn/jsowell-charger-web
1
0
Fork 0
mirror of https://codeup.aliyun.com/67c68d4e484ca2f0a13ac3c1/ydc/jsowell-charger-web.git synced 2026-05-06 19:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://192.168.2.2:8099/jsowell/jsowell-charger-web into dev

Browse Source
This commit is contained in:
Lemon
2023-05-27 11:55:54 +08:00
parent 298f36dcf0 59efb253e4
commit d03c300591
4 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jsowell-admin/src/main/java/com/jsowell/api/uniapp/PayController.java
View File

@@ -309,6 +309,14 @@ public class PayController extends BaseController {
return response;
}
/**
* 汇付支付退款
*/
public RestApiResponse<?> adapayRefund(HttpServletRequest request, @RequestBody WeChatRefundDTO dto) {
return null;
}
/**
* 汇付支付回调
* <a href="https://api.jsowellcloud.com/uniapp/pay/adapayCallback">...</a>

16
jsowell-admin/src/test/java/SpringBootTestController.java
View File

@@ -2,6 +2,8 @@ import cn.hutool.json.JSONUtil;
import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.PropertyNamingStrategies;
import com.google.common.collect.ImmutableMap;
import com.jsowell.JsowellApplication;
import com.jsowell.common.constant.CacheConstants;
@@ -138,6 +140,20 @@ public class SpringBootTestController {
static final String ALGORITHM_MAC = "HmacMD5";
@Autowired
private AdapayCallbackRecordService adapayCallbackRecordService;
@Test
public void testSaveCallback() throws JsonProcessingException {
String data = "{\"app_id\":\"app_d0c80cb1-ffc8-48cb-a030-fe9bec823aaa\",\"created_time\":\"20230527100758\",\"description\":\"{\\\"type\\\":\\\"balance\\\",\\\"memberId\\\":\\\"29336349\\\"}\",\"end_time\":\"20230527100810\",\"expend\":{\"bank_type\":\"OTHERS\",\"open_id\":\"o8jhot6PJF93EPhNISsXi28dKdS8\",\"sub_open_id\":\"o4REX5MprZfTaLnVNxfdOY-wnwGI\"},\"fee_amt\":\"0.00\",\"id\":\"002212023052710075810508353847861903360\",\"order_no\":\"4c457bd474334d5eaf82f4795265b6ad\",\"out_trans_id\":\"4200001864202305270647556621\",\"party_order_id\":\"02212305273647819807712\",\"pay_amt\":\"0.01\",\"pay_channel\":\"wx_lite\",\"real_amt\":\"0.01\",\"share_eq\":\"Y\",\"status\":\"succeeded\",\"wx_user_id\":\"\"}";
JSONObject jsonObject = JSON.parseObject(data);
ObjectMapper mapper = new ObjectMapper();
mapper.setPropertyNamingStrategy(PropertyNamingStrategies.SNAKE_CASE);
AdapayCallbackRecord adapayCallbackRecord = mapper.readValue(jsonObject.toJSONString(), AdapayCallbackRecord.class);
adapayCallbackRecord.setExpend(jsonObject.getString("expend"));
adapayCallbackRecordService.saveAdapayCallbackRecord(adapayCallbackRecord);
}
@Test
public void testGenerateLianlianToken() throws UnsupportedEncodingException {
String OperatorID = "425010765";

15
jsowell-pile/src/main/java/com/jsowell/pile/domain/AdapayCallbackRecord.java
View File

@@ -1,6 +1,10 @@
package com.jsowell.pile.domain;
import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.math.BigDecimal;
@@ -11,11 +15,16 @@ import java.util.Date;
* @author
*/
@Data
@NoArgsConstructor
@AllArgsConstructor
@Builder
public class AdapayCallbackRecord implements Serializable {
/**
* 主键id
*/
private String id;
private Integer id;
private String paymentId;
/**
* 汇付商户appId
@@ -37,7 +46,8 @@ public class AdapayCallbackRecord implements Serializable {
*/
private String endTime;
private Object expend;
@JsonIgnore
private String expend;
private BigDecimal feeAmt;
@@ -73,4 +83,5 @@ public class AdapayCallbackRecord implements Serializable {
private String delFlag;
private static final long serialVersionUID = 1L;
}

27
jsowell-pile/src/main/resources/mapper/pile/AdapayCallbackRecordMapper.xml
View File

@@ -2,7 +2,8 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.jsowell.pile.mapper.AdapayCallbackRecordMapper">
<resultMap id="BaseResultMap" type="com.jsowell.pile.domain.AdapayCallbackRecord">
<id column="id" jdbcType="VARCHAR" property="id" />
<id column="id" property="id" />
<result column="payment_id" jdbcType="VARCHAR" property="paymentId" />
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="created_time" jdbcType="VARCHAR" property="createdTime" />
@@ -22,7 +23,7 @@
<result column="del_flag" jdbcType="VARCHAR" property="delFlag" />
</resultMap>
<sql id="Base_Column_List">
id, app_id, description, created_time, end_time, expend, fee_amt, order_no, out_trans_id,
id, payment_id, app_id, description, created_time, end_time, expend, fee_amt, order_no, out_trans_id,
party_order_id, pay_amt, pay_channel, real_amt, share_eq, `status`, wx_user_id, create_time,
del_flag
</sql>
@@ -37,22 +38,23 @@
where id = #{id,jdbcType=VARCHAR}
</delete>
<insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayCallbackRecord" useGeneratedKeys="true">
insert into adapay_callback_record (app_id, description, created_time,
insert into adapay_callback_record (payment_id, app_id, description, created_time,
end_time, expend, fee_amt,
order_no, out_trans_id, party_order_id,
pay_amt, pay_channel, real_amt,
share_eq, `status`, wx_user_id,
create_time, del_flag)
values (#{appId,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{createdTime,jdbcType=VARCHAR},
share_eq, `status`, wx_user_id)
values (#{paymentId,jdbcType=VARCHAR},#{appId,jdbcType=VARCHAR}, #{description,jdbcType=VARCHAR}, #{createdTime,jdbcType=VARCHAR},
#{endTime,jdbcType=VARCHAR}, #{expend,jdbcType=OTHER}, #{feeAmt,jdbcType=DECIMAL},
#{orderNo,jdbcType=VARCHAR}, #{outTransId,jdbcType=VARCHAR}, #{partyOrderId,jdbcType=VARCHAR},
#{payAmt,jdbcType=DECIMAL}, #{payChannel,jdbcType=VARCHAR}, #{realAmt,jdbcType=DECIMAL},
#{shareEq,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR},
#{createTime,jdbcType=TIMESTAMP}, #{delFlag,jdbcType=VARCHAR})
#{shareEq,jdbcType=VARCHAR}, #{status,jdbcType=VARCHAR}, #{wxUserId,jdbcType=VARCHAR})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.jsowell.pile.domain.AdapayCallbackRecord" useGeneratedKeys="true">
insert into adapay_callback_record
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="paymentId != null">
payment_id,
</if>
<if test="appId != null">
app_id,
</if>
@@ -106,6 +108,9 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="paymentId != null">
#{paymentId,jdbcType=VARCHAR},
</if>
<if test="appId != null">
#{appId,jdbcType=VARCHAR},
</if>
@@ -162,6 +167,9 @@
<update id="updateByPrimaryKeySelective" parameterType="com.jsowell.pile.domain.AdapayCallbackRecord">
update adapay_callback_record
<set>
<if test="paymentId != null">
payment_id = #{paymentId,jdbcType=VARCHAR},
</if>
<if test="appId != null">
app_id = #{appId,jdbcType=VARCHAR},
</if>
@@ -218,7 +226,8 @@
</update>
<update id="updateByPrimaryKey" parameterType="com.jsowell.pile.domain.AdapayCallbackRecord">
update adapay_callback_record
set app_id = #{appId,jdbcType=VARCHAR},
set payment_id = #{paymentId,jdbcType=VARCHAR},
app_id = #{appId,jdbcType=VARCHAR},
description = #{description,jdbcType=VARCHAR},
created_time = #{createdTime,jdbcType=VARCHAR},
end_time = #{endTime,jdbcType=VARCHAR},