From d99364049d02d37b2fb521e6b3c3f586b1cecaab Mon Sep 17 00:00:00 2001 From: Boris Date: Fri, 17 Nov 2023 00:39:38 +0800 Subject: [PATCH] =?UTF-8?q?:art:=20#3167=20=E3=80=90=E8=A7=86=E9=A2=91?= =?UTF-8?q?=E5=8F=B7=E3=80=91=E8=A7=86=E9=A2=91=E5=8F=B7=E5=B0=8F=E5=BA=97?= =?UTF-8?q?=E5=88=86=E4=BA=AB=E5=91=98=E8=AE=A2=E5=8D=95=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=87=A0=E4=B8=AA=E8=BF=94=E5=9B=9E=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8C=E5=B9=B6=E4=BF=AE=E5=A4=8Dopenid=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/impl/WxChannelSharerServiceImpl.java | 7 ++- .../channel/bean/sharer/SharerOrder.java | 44 ++++++++++++++++--- .../channel/bean/sharer/SharerOrderParam.java | 2 +- 3 files changed, 44 insertions(+), 9 deletions(-) diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java index 96438ae00..676b31028 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/api/impl/WxChannelSharerServiceImpl.java @@ -7,6 +7,7 @@ import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Share. import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Share.SEARCH_SHARER_URL; import static me.chanjar.weixin.channel.constant.WxChannelApiUrlConstants.Share.UNBIND_SHARER_URL; +import com.google.gson.JsonObject; import java.util.List; import lombok.extern.slf4j.Slf4j; import me.chanjar.weixin.channel.api.WxChannelSharerService; @@ -21,6 +22,7 @@ import me.chanjar.weixin.channel.bean.sharer.SharerUnbindParam; import me.chanjar.weixin.channel.bean.sharer.SharerUnbindResponse; import me.chanjar.weixin.channel.util.ResponseUtils; import me.chanjar.weixin.common.error.WxErrorException; +import me.chanjar.weixin.common.util.json.GsonHelper; /** * 视频号小店 分享员服务实现 @@ -39,8 +41,9 @@ public class WxChannelSharerServiceImpl implements WxChannelSharerService { @Override public SharerBindResponse bindSharer(String username) throws WxErrorException { - String reqJson = "{\"username\": " + username + "}"; - String resJson = shopService.post(BIND_SHARER_URL, reqJson); + JsonObject jsonObject = GsonHelper.buildJsonObject("username", username); + + String resJson = shopService.post(BIND_SHARER_URL, jsonObject); return ResponseUtils.decode(resJson, SharerBindResponse.class); } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrder.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrder.java index b184187b3..682753e64 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrder.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrder.java @@ -15,24 +15,56 @@ import lombok.NoArgsConstructor; public class SharerOrder implements Serializable { private static final long serialVersionUID = 1528673402572025670L; - /** 订单号 */ + /** + * 订单号 + */ @JsonProperty("order_id") private String orderId; - /** 分享场景 {@link me.chanjar.weixin.channel.enums.ShareScene} */ - @JsonProperty("sharer_scene") + /** + * 分享场景 {@link me.chanjar.weixin.channel.enums.ShareScene} + */ + @JsonProperty("share_scene") private Integer sharerScene; - /** 分享员openid */ + /** + * 分享员openid + */ @JsonProperty("sharer_openid") private String sharerOpenid; - /** 分享员类型 {@link me.chanjar.weixin.channel.enums.SharerType} */ + /** + * 分享员类型 {@link me.chanjar.weixin.channel.enums.SharerType} + */ @JsonProperty("sharer_type") private Integer sharerType; - /** 视频号场景信息 */ + /** + * 商品sku_id + */ + @JsonProperty("sku_id") + private String skuId; + + + /** + * 商品唯一id + */ + @JsonProperty("product_id") + private String productId; + + + /** + * 是否从企微分享 + */ + @JsonProperty("from_wecom") + private Boolean fromWxWork; + + + /** + * 视频号场景信息 + */ @JsonProperty("finder_scene_info") private FinderSceneInfo sceneInfo; + } diff --git a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrderParam.java b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrderParam.java index 191dfc6ec..5ada6e3bc 100644 --- a/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrderParam.java +++ b/weixin-java-channel/src/main/java/me/chanjar/weixin/channel/bean/sharer/SharerOrderParam.java @@ -20,7 +20,7 @@ public class SharerOrderParam extends PageParam { private static final long serialVersionUID = 5240085870008898601L; /** 分享员openid */ @JsonProperty("openid") - private Integer openid; + private String openid; /** 分享场景 */ @JsonProperty("share_scene")