Skip to content

Commit 982ad86

Browse files
binarywangbinarywang
committed
🎨 小商店相关代码修复优化
1 parent d29d180 commit 982ad86

40 files changed

Lines changed: 594 additions & 521 deletions

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/WxOpenMinishopService.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,25 +11,25 @@
1111
* add by kelven 2021-01-29
1212
*/
1313
public interface WxOpenMinishopService {
14-
String submitMerchantInfoUrl = "https://api.weixin.qq.com/product/register/submit_merchantinfo";
14+
String submitMerchantInfoUrl = "https://api.weixin.qq.com/product/register/submit_merchantinfo";
1515

16-
String submitBasicInfoUrl = "https://api.weixin.qq.com/product/register/submit_basicinfo";
16+
String submitBasicInfoUrl = "https://api.weixin.qq.com/product/register/submit_basicinfo";
1717

18-
19-
public final static String UPLOAD_IMG_MINISHOP_FILE_URL = "https://api.weixin.qq.com/product/img/upload";
18+
String UPLOAD_IMG_MINISHOP_FILE_URL = "https://api.weixin.qq.com/product/img/upload";
2019

2120
String getCategoryUrl = "https://api.weixin.qq.com/product/category/get";
2221

2322
String getBrandsUrl = "https://api.weixin.qq.com/product/brand/get";
2423

2524
String getDeliveryUrl = "https://api.weixin.qq.com/product/delivery/get_freight_template";
2625

27-
/**获取店铺的商品分类*/
26+
/**
27+
* 获取店铺的商品分类
28+
*/
2829
String getShopCatUrl = "https://api.weixin.qq.com/product/store/get_shopcat";
2930

3031

3132
/**
32-
*
3333
* @param appId
3434
* @param subjectType
3535
* @param busiLicense

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/api/impl/WxOpenComponentServiceImpl.java‎

Lines changed: 11 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package me.chanjar.weixin.open.api.impl;
22

33
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
4-
import com.fasterxml.jackson.databind.util.JSONPObject;
5-
import com.google.gson.Gson;
64
import com.google.gson.JsonArray;
75
import com.google.gson.JsonObject;
86
import com.google.gson.reflect.TypeToken;
97
import lombok.AllArgsConstructor;
108
import lombok.extern.slf4j.Slf4j;
119
import me.chanjar.weixin.common.api.WxConsts;
12-
import me.chanjar.weixin.common.bean.result.WxMediaUploadResult;
13-
import me.chanjar.weixin.common.bean.result.WxMinishopImageUploadResult;
1410
import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
11+
import me.chanjar.weixin.common.bean.result.WxMinishopImageUploadResult;
1512
import me.chanjar.weixin.common.error.WxError;
1613
import me.chanjar.weixin.common.error.WxErrorException;
1714
import me.chanjar.weixin.common.error.WxRuntimeException;
@@ -20,17 +17,8 @@
2017
import me.chanjar.weixin.common.util.json.GsonParser;
2118
import me.chanjar.weixin.common.util.json.WxGsonBuilder;
2219
import me.chanjar.weixin.mp.api.WxMpService;
23-
import me.chanjar.weixin.open.api.WxOpenComponentService;
24-
import me.chanjar.weixin.open.api.WxOpenConfigStorage;
25-
import me.chanjar.weixin.open.api.WxOpenFastMaService;
26-
import me.chanjar.weixin.open.api.WxOpenMaService;
27-
import me.chanjar.weixin.open.api.WxOpenMpService;
28-
import me.chanjar.weixin.open.api.WxOpenService;
29-
import me.chanjar.weixin.open.bean.WxOpenAuthorizerAccessToken;
30-
import me.chanjar.weixin.open.bean.WxOpenComponentAccessToken;
31-
import me.chanjar.weixin.open.bean.WxOpenCreateResult;
32-
import me.chanjar.weixin.open.bean.WxOpenGetResult;
33-
import me.chanjar.weixin.open.bean.WxOpenMaCodeTemplate;
20+
import me.chanjar.weixin.open.api.*;
21+
import me.chanjar.weixin.open.bean.*;
3422
import me.chanjar.weixin.open.bean.auth.WxOpenAuthorizationInfo;
3523
import me.chanjar.weixin.open.bean.message.WxOpenXmlMessage;
3624
import me.chanjar.weixin.open.bean.minishop.*;
@@ -40,11 +28,6 @@
4028
import me.chanjar.weixin.open.bean.minishop.limitdiscount.LimitDiscountGoods;
4129
import me.chanjar.weixin.open.bean.minishop.limitdiscount.LimitDiscountSku;
4230
import me.chanjar.weixin.open.bean.result.*;
43-
import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerInfoResult;
44-
import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerListResult;
45-
import me.chanjar.weixin.open.bean.result.WxOpenAuthorizerOptionResult;
46-
import me.chanjar.weixin.open.bean.result.WxOpenQueryAuthResult;
47-
import me.chanjar.weixin.open.bean.result.WxOpenResult;
4831
import me.chanjar.weixin.open.util.json.WxOpenGsonBuilder;
4932
import org.apache.commons.lang3.StringUtils;
5033

@@ -519,7 +502,7 @@ public void addToTemplate(long draftId) throws WxErrorException {
519502
}
520503

521504
@Override
522-
public void addToTemplate(long draftId,int templateType) throws WxErrorException {
505+
public void addToTemplate(long draftId, int templateType) throws WxErrorException {
523506
JsonObject param = new JsonObject();
524507
param.addProperty("draft_id", draftId);
525508
param.addProperty("template_type", templateType);
@@ -657,7 +640,7 @@ public String checkAuditStatus(String wxName) throws WxErrorException {
657640
public String checkAuditStatus(String appId, String wxName) throws WxErrorException {
658641
JsonObject jsonObject = new JsonObject();
659642
jsonObject.addProperty("wx_name", wxName);
660-
String url = CHECK_SHOP_AUDITSTATUS_URL + "?access_token=" + getAuthorizerAccessToken(appId, false);
643+
String url = CHECK_SHOP_AUDITSTATUS_URL + "?access_token=" + getAuthorizerAccessToken(appId, false);
661644
String response = post(url, jsonObject.toString());
662645
log.info("CHECK_SHOP_AUDITSTATUS_URL: " + response);
663646
return response;
@@ -700,7 +683,7 @@ public WxOpenResult submitBasicInfo(String appId, MinishopNameInfo nameInfo, Min
700683

701684
@Override
702685
public WxMinishopImageUploadResult uploadMinishopImagePicFile(String appId, Integer height, Integer width, File file) throws WxErrorException {
703-
String url = WxOpenMinishopService.UPLOAD_IMG_MINISHOP_FILE_URL + "?access_token="+getAuthorizerAccessToken(appId, false)+"&height="+height+"&width="+width;
686+
String url = WxOpenMinishopService.UPLOAD_IMG_MINISHOP_FILE_URL + "?access_token=" + getAuthorizerAccessToken(appId, false) + "&height=" + height + "&width=" + width;
704687
log.info("upload url: " + url);
705688
// String response = (url, file);
706689
WxMinishopImageUploadResult result = getWxOpenService().uploadMinishopMediaFile(url, file);
@@ -1114,8 +1097,6 @@ public WxOpenResult minishopGoodsUpdateSkuStock(String appId, Long productId, Lo
11141097
jsonObject.addProperty("stock_num", stockNum);
11151098

11161099

1117-
1118-
11191100
String response = getWxOpenService().post(url, jsonObject.toString());
11201101

11211102
return WxOpenGsonBuilder.create().fromJson(response, WxOpenResult.class);
@@ -1155,18 +1136,18 @@ public List<LimitDiscountGoods> getLimitDiscountList(String appId, Integer statu
11551136

11561137
JsonArray jsonArray = respObj.get("limited_discount_list").getAsJsonArray();
11571138
if (jsonArray != null && jsonArray.size() > 0) {
1158-
for (int i = 0; i < jsonArray.size(); i ++) {
1139+
for (int i = 0; i < jsonArray.size(); i++) {
11591140
JsonObject goodsObj = jsonArray.get(i).getAsJsonObject();
11601141
LimitDiscountGoods discountGoods = new LimitDiscountGoods();
11611142
discountGoods.setTaskId(goodsObj.get("task_id").getAsLong());
11621143
discountGoods.setStatus(goodsObj.get("status").getAsInt());
1163-
discountGoods.setStartTime(new Date(goodsObj.get("start_time").getAsLong()*1000));
1164-
discountGoods.setEndTime(new Date(goodsObj.get("end_time").getAsLong()*1000));
1144+
discountGoods.setStartTime(new Date(goodsObj.get("start_time").getAsLong() * 1000));
1145+
discountGoods.setEndTime(new Date(goodsObj.get("end_time").getAsLong() * 1000));
11651146

11661147
List<LimitDiscountSku> skuList = new ArrayList<>();
11671148
JsonArray skuArray = goodsObj.get("limited_discount_sku_list").getAsJsonArray();
11681149
if (skuArray != null && skuArray.size() > 0) {
1169-
for (int j = 0; j < skuArray.size(); j ++) {
1150+
for (int j = 0; j < skuArray.size(); j++) {
11701151
JsonObject skuObj = skuArray.get(i).getAsJsonObject();
11711152
LimitDiscountSku sku = new LimitDiscountSku();
11721153
sku.setSkuId(skuObj.get("sku_id").getAsLong());
@@ -1186,7 +1167,7 @@ public List<LimitDiscountGoods> getLimitDiscountList(String appId, Integer statu
11861167
}
11871168

11881169
@Override
1189-
public WxOpenResult updateLimitDiscountStatus(String appId, Long taskId, Integer status) throws WxErrorException {
1170+
public WxOpenResult updateLimitDiscountStatus(String appId, Long taskId, Integer status) throws WxErrorException {
11901171
String url = API_MINISHOP_UPDATE_LIMIT_DICOUNT_STATUS_URL + "access_token=" + getAuthorizerAccessToken(appId, false);
11911172
JsonObject jsonObject = new JsonObject();
11921173
jsonObject.addProperty("task_id", taskId);

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/minishop/MinishopAddressInfo.java‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,55 @@
11
package me.chanjar.weixin.open.bean.minishop;
22

33
import com.google.gson.JsonObject;
4-
import io.swagger.annotations.ApiModel;
5-
import io.swagger.annotations.ApiModelProperty;
64
import lombok.Data;
75

86
import java.io.Serializable;
97

8+
/**
9+
* 小商店地址信息
10+
*/
1011
@Data
11-
@ApiModel("小商店地址信息")
1212
public class MinishopAddressInfo implements Serializable {
1313
private static final long serialVersionUID = 1L;
1414

1515
/**
1616
* 收货人姓名
1717
*/
18-
@ApiModelProperty("收货人姓名 必填")
1918
private String userName;
2019

2120
/**
2221
* 邮政编码
2322
*/
24-
@ApiModelProperty("邮政编码 必填")
2523
private String postalCode;
2624

2725
/**
2826
* 省份，格式：广东省 北京市
2927
*/
30-
@ApiModelProperty("省份，格式：广东省 北京市 必填")
3128
private String province;
3229

3330
/**
3431
* 城市，格式：广州市
3532
*/
36-
@ApiModelProperty("城市，格式：广州市 必填")
3733
private String cityName;
3834

3935
/**
4036
* 区，格式：海珠区
4137
*/
42-
@ApiModelProperty("区，格式：海珠区 必填")
4338
private String countyName;
4439

4540
/**
4641
* 详细地址
4742
*/
48-
@ApiModelProperty("详细地址，必填")
4943
private String detailInfo;
5044

5145
/**
5246
* 国家码
5347
*/
54-
@ApiModelProperty("国家码，选填")
5548
private String nationalCode;
5649

5750
/**
5851
* 电话号码
5952
*/
60-
@ApiModelProperty("电话号码")
6153
private String telNumber;
6254

6355
public JsonObject toJsonObject() {

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/minishop/MinishopAuditStatus.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
@Data
99
public class MinishopAuditStatus implements Serializable {
10+
private static final long serialVersionUID = 106594659951047198L;
1011

1112
private WxError wxError;
1213

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/minishop/MinishopBaseInfo.java‎

Lines changed: 50 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -6,66 +6,60 @@
66
import java.io.Serializable;
77

88
/**
9-
* <p>
10-
*
11-
* </p>
12-
*
139
* @author luowentao
1410
* @since 2021-01-27
1511
*/
1612
@Data
1713
public class MinishopBaseInfo implements Serializable {
18-
19-
private static final long serialVersionUID = 1L;
20-
21-
/**
22-
* 微信小商店ID（自定）
23-
*/
24-
private Long miniShopId;
25-
26-
/**
27-
* 小程序ID
28-
*/
29-
private String appId;
30-
31-
/**
32-
* 1）小程序名称可以由中文、数字、英文、空格及部分特殊符号(“空格”、“-”、“+”、“&”、“.”)组成。长度在4-30个字符之间，一个中文字等于2个字符。
33-
2）公众号、小程序在微信公众平台上的名称是唯一的，且属于同一主体下，可以重名。
34-
3）不得与不同主体的公众号名称重名。
35-
*/
36-
private String nickName;
37-
38-
/**
39-
* 1）小程序简称可以从小程序名称中按顺序截取字符创建。长度在4-10个字符之间，一个中文字等于2个字符。
40-
2）小程序简称在微信公众平台是不唯一的，可以重名。但对于仿冒、侵权等恶意情况，平台仍会做出相关处罚。开发者也可通过侵权投诉维护自己的正当权益。
41-
3）小程序简称设置后，将在客户端任务栏向用户展示。开发者可以凭借此功能，更好地实现产品品牌价值和展示。目前暂不支持名称的其他功能。
42-
*/
43-
private String abbr;
44-
45-
/**
46-
* 介绍。请确认介绍内容不含国家相关法律法规禁止内容,介绍字数为4-120个字符，一个中文占2个字符。一个月内可申请5次修改。请提供可支持命名的材料
47-
*/
48-
private String introduction;
49-
50-
/**
51-
* 补充材料，传media id数组，当返回210047时必填
52-
*/
53-
private String namingOtherStuff;
54-
55-
/**
56-
* 邮箱
57-
*/
58-
private String mail;
59-
60-
/**
61-
* 退货地址
62-
*/
63-
private Integer returnAddressId;
64-
65-
/**
66-
* 公司地址
67-
*/
68-
private Integer companyAddressId;
69-
14+
private static final long serialVersionUID = 1L;
15+
16+
/**
17+
* 微信小商店ID（自定）
18+
*/
19+
private Long miniShopId;
20+
21+
/**
22+
* 小程序ID
23+
*/
24+
private String appId;
25+
26+
/**
27+
* 1）小程序名称可以由中文、数字、英文、空格及部分特殊符号(“空格”、“-”、“+”、“&”、“.”)组成。长度在4-30个字符之间，一个中文字等于2个字符。
28+
* 2）公众号、小程序在微信公众平台上的名称是唯一的，且属于同一主体下，可以重名。
29+
* 3）不得与不同主体的公众号名称重名。
30+
*/
31+
private String nickName;
32+
33+
/**
34+
* 1）小程序简称可以从小程序名称中按顺序截取字符创建。长度在4-10个字符之间，一个中文字等于2个字符。
35+
* 2）小程序简称在微信公众平台是不唯一的，可以重名。但对于仿冒、侵权等恶意情况，平台仍会做出相关处罚。开发者也可通过侵权投诉维护自己的正当权益。
36+
* 3）小程序简称设置后，将在客户端任务栏向用户展示。开发者可以凭借此功能，更好地实现产品品牌价值和展示。目前暂不支持名称的其他功能。
37+
*/
38+
private String abbr;
39+
40+
/**
41+
* 介绍。请确认介绍内容不含国家相关法律法规禁止内容,介绍字数为4-120个字符，一个中文占2个字符。一个月内可申请5次修改。请提供可支持命名的材料
42+
*/
43+
private String introduction;
44+
45+
/**
46+
* 补充材料，传media id数组，当返回210047时必填
47+
*/
48+
private String namingOtherStuff;
49+
50+
/**
51+
* 邮箱
52+
*/
53+
private String mail;
54+
55+
/**
56+
* 退货地址
57+
*/
58+
private Integer returnAddressId;
59+
60+
/**
61+
* 公司地址
62+
*/
63+
private Integer companyAddressId;
7064

7165
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/minishop/MinishopBrand.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
package me.chanjar.weixin.open.bean.minishop;
22

33
import lombok.Data;
4-
import lombok.Getter;
5-
import lombok.Setter;
64

75
import java.io.Serializable;
86

97
@Data
108
public class MinishopBrand implements Serializable {
9+
private static final long serialVersionUID = -112023091374421283L;
10+
1111
private Integer firstCatId;
1212

1313
private Integer secondCatId;
1414

1515
private Integer thirdCatId;
1616

1717
@Data
18-
@Getter
19-
@Setter
2018
public static class MinishopBrandInfo implements Serializable {
19+
private static final long serialVersionUID = 5727133059972671186L;
20+
2121
private Integer brandId;
2222
private String brandName;
2323
}

‎weixin-java-open/src/main/java/me/chanjar/weixin/open/bean/minishop/MinishopBrandList.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77

88
@Data
99
public class MinishopBrandList implements Serializable {
10+
private static final long serialVersionUID = -8508031421949817741L;
11+
1012
private Integer errcode;
1113

1214
private String errmsg;

0 commit comments

Comments
 (0)