wechat/weixin-java-tools
1
0
Fork 0
mirror of https://gitee.com/binary/weixin-java-tools.git synced 2025-10-31 18:46:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

🎨 #2687 【小程序】直播商品管理接口添加缺失的字段thirdPartyAppid

Browse Source
This commit is contained in:
徐凯旋
2022-06-14 09:42:32 +08:00
committed by Binary Wang
parent d390c5d9fe
commit a9fe0b29d4
5 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveGoodInfo.java
View File

@ -27,4 +27,10 @@ public class WxMaLiveGoodInfo implements Serializable {
* https://developers.weixin.qq.com/miniprogram/dev/platform-capabilities/industry/liveplayer/pendant.html
*/
private List<String> goodsKey;
/**
* 当商品为第三方小程序的商品则填写为对应第三方小程序的appid，自身小程序商品则为''
*/
private String thirdPartyAppid;
}

5
weixin-java-miniapp/src/main/java/cn/binarywang/wx/miniapp/bean/live/WxMaLiveResult.java
View File

@ -74,6 +74,11 @@ public class WxMaLiveResult implements Serializable {
*/
@SerializedName("third_party_tag")
private String thirdPartyTag;
/**
* 当商品为第三方小程序的商品则填写为对应第三方小程序的appid，自身小程序商品则为''
*/
private String thirdPartyAppid;
}
/**

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/RefundsResult.java
View File

@ -66,7 +66,7 @@ public class RefundsResult implements Serializable {
* </pre>
*/
@SerializedName(value = "create_time")
private Date createTime;
private String createTime;
/**
* <pre>

2
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/bean/ecommerce/ReturnOrdersResult.java
View File

@ -163,6 +163,6 @@ public class ReturnOrdersResult implements Serializable {
* </pre>
*/
@SerializedName(value = "finish_time")
private Date finishTime;
private String finishTime;
}

12
weixin-java-pay/src/main/java/com/github/binarywang/wxpay/service/impl/EcommerceServiceImpl.java
View File

@ -12,15 +12,15 @@ import com.github.binarywang.wxpay.v3.util.RsaCryptoUtil;
import com.google.common.base.CaseFormat;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import org.apache.commons.lang3.StringUtils;
import lombok.RequiredArgsConstructor;
import org.apache.commons.beanutils.BeanMap;
import org.apache.commons.lang3.StringUtils;
import java.io.IOException;
import java.io.InputStream;
import java.net.URI;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.text.DateFormat;
import java.util.Iterator;
import java.util.Map;
import java.util.Objects;
@ -30,6 +30,11 @@ import java.util.Set;
public class EcommerceServiceImpl implements EcommerceService {
private static final Gson GSON = new GsonBuilder().create();
// https://stackoverflow.com/questions/6873020/gson-date-format
// gson default date format not match, so custom DateFormat
// detail DateFormat: FULL,LONG,SHORT,MEDIUM
private static final Gson GSON_CUSTOM = new GsonBuilder().setDateFormat(DateFormat.FULL, DateFormat.FULL).create();
private final WxPayService payService;
@Override
@ -359,6 +364,7 @@ public class EcommerceServiceImpl implements EcommerceService {
/**
* 校验通知签名
*
* @param header 通知头信息
* @param data 通知数据
* @return true:校验通过 false:校验不通过
@ -374,6 +380,7 @@ public class EcommerceServiceImpl implements EcommerceService {
/**
* 对象拼接到url
*
* @param o 转换对象
* @return 拼接好的string
*/
@ -392,5 +399,4 @@ public class EcommerceServiceImpl implements EcommerceService {
return sb.deleteCharAt(sb.length() - 1).toString();
}
}