Skip to content

Commit 11974f0

Browse files
binarywangbinarywang
committed
🎨 会员卡相关bean类重构，集中到同一包中
1 parent f6f4b89 commit 11974f0

28 files changed

+52
-46
lines changed

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/WxMpMemberCardService.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
import me.chanjar.weixin.common.error.WxErrorException;
44
import me.chanjar.weixin.mp.bean.card.CardUpdateResult;
5-
import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormRequest;
6-
import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormResult;
7-
import me.chanjar.weixin.mp.bean.card.MemberCardUpdateRequest;
5+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormRequest;
6+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormResult;
7+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCardUpdateRequest;
88
import me.chanjar.weixin.mp.bean.card.WxMpCardCreateResult;
9-
import me.chanjar.weixin.mp.bean.membercard.*;
9+
import me.chanjar.weixin.mp.bean.card.membercard.*;
1010

1111
/**
1212
* 会员卡相关接口.

‎weixin-java-mp/src/main/java/me/chanjar/weixin/mp/api/impl/WxMpMemberCardServiceImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import java.util.Map;
77

88
import lombok.RequiredArgsConstructor;
9-
import me.chanjar.weixin.mp.bean.membercard.*;
9+
import me.chanjar.weixin.mp.bean.card.membercard.*;
1010
import me.chanjar.weixin.mp.enums.WxMpApiUrl;
1111
import org.apache.commons.lang3.StringUtils;
1212

@@ -24,11 +24,11 @@
2424
import me.chanjar.weixin.mp.bean.card.BaseInfo;
2525
import me.chanjar.weixin.mp.bean.card.CardUpdateResult;
2626
import me.chanjar.weixin.mp.bean.card.DateInfo;
27-
import me.chanjar.weixin.mp.bean.card.MemberCard;
28-
import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormRequest;
29-
import me.chanjar.weixin.mp.bean.card.MemberCardActivateUserFormResult;
30-
import me.chanjar.weixin.mp.bean.card.MemberCardCreateRequest;
31-
import me.chanjar.weixin.mp.bean.card.MemberCardUpdateRequest;
27+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCard;
28+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormRequest;
29+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCardActivateUserFormResult;
30+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCardCreateRequest;
31+
import me.chanjar.weixin.mp.bean.card.membercard.MemberCardUpdateRequest;
3232
import me.chanjar.weixin.mp.bean.card.WxMpCardCreateResult;
3333
import me.chanjar.weixin.mp.bean.card.enums.BusinessServiceType;
3434
import me.chanjar.weixin.mp.bean.card.enums.CardColor;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParam.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParam.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean.membercard;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import com.google.gson.annotations.SerializedName;
44
import lombok.Data;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/membercard/ActivatePluginParamResult.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/ActivatePluginParamResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean.membercard;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import lombok.Data;
44

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCard.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCard.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
package me.chanjar.weixin.mp.bean.card;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import java.io.Serializable;
44

55
import com.google.gson.annotations.SerializedName;
66
import lombok.Data;
7+
import me.chanjar.weixin.mp.bean.card.*;
78
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
89

910
/**

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormRequest.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormRequest.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean.card;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import com.google.gson.JsonObject;
44
import com.google.gson.annotations.SerializedName;
@@ -46,8 +46,9 @@ public void setBindOldCard(String name, String url) {
4646
if (StringUtils.isAnyEmpty(name, url)) {
4747
return;
4848
}
49-
if (bindOldCard == null)
49+
if (bindOldCard == null) {
5050
bindOldCard = new JsonObject();
51+
}
5152
bindOldCard.addProperty("name", name);
5253
bindOldCard.addProperty("url", url);
5354
}
@@ -62,8 +63,9 @@ public void setServiceStatement(String name, String url) {
6263
if (StringUtils.isAnyEmpty(name, url)) {
6364
return;
6465
}
65-
if (serviceStatement == null)
66+
if (serviceStatement == null) {
6667
serviceStatement = new JsonObject();
68+
}
6769
serviceStatement.addProperty("name", name);
6870
serviceStatement.addProperty("url", url);
6971
}

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardActivateUserFormResult.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardActivateUserFormResult.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean.card;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import java.io.Serializable;
44

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardCreateRequest.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardCreateRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean.card;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import com.google.gson.annotations.SerializedName;
44
import lombok.Data;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdate.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdate.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
package me.chanjar.weixin.mp.bean.card;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import com.google.gson.annotations.SerializedName;
44
import lombok.Data;
5+
import me.chanjar.weixin.mp.bean.card.BaseInfoUpdate;
6+
import me.chanjar.weixin.mp.bean.card.BonusRule;
7+
import me.chanjar.weixin.mp.bean.card.CustomCell1;
8+
import me.chanjar.weixin.mp.bean.card.CustomField;
59
import me.chanjar.weixin.mp.util.json.WxMpGsonBuilder;
610

711
import java.io.Serializable;

weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/MemberCardUpdateRequest.java renamed to weixin-java-mp/src/main/java/me/chanjar/weixin/mp/bean/card/membercard/MemberCardUpdateRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package me.chanjar.weixin.mp.bean.card;
1+
package me.chanjar.weixin.mp.bean.card.membercard;
22

33
import com.google.gson.annotations.SerializedName;
44
import lombok.Data;

0 commit comments

Comments
 (0)