Repository navigation
查询订单支付状态返回的结果WxMpPayResult增加新字段 #43
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,93 +41,102 @@ public class WxMpPayResult implements Serializable { | |
| private String out_trade_no; | ||
| private String attach; | ||
| private String time_end; | ||
|
|
||
| /** | ||
| * 现金支付金额 cash_fee 是 Int 100 现金支付金额订单现金支付金额,详见支付金额 | ||
| */ | ||
| private String cash_fee; | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 字段命名不够规范,建议使用java标准的驼峰命名,不过之前的代码也还未规范化,如果有空的话可以帮忙规范下,没有时间的话就先暂时这样,以后抽时间再弄
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. 关于命名的问题,我看过原来的项目,是为了好在微信端返回xml或json时序列化对象时直接使用工具,不用其它操作,我猜之前不规范也是基于这个考虑的吧 |
||
|
|
||
| /** | ||
| * 现金支付货币类型 cash_fee_type 否 | ||
| * | ||
| */ | ||
| private String cash_fee_type; | ||
| public String getReturn_code() { | ||
| return this.return_code; | ||
| return return_code; | ||
| } | ||
|
|
||
| public String getReturn_msg() { | ||
| return this.return_msg; | ||
| return return_msg; | ||
| } | ||
|
|
||
| public String getAppid() { | ||
| return this.appid; | ||
| return appid; | ||
| } | ||
|
|
||
| public String getMch_id() { | ||
| return this.mch_id; | ||
| return mch_id; | ||
| } | ||
|
|
||
| public String getNonce_str() { | ||
| return this.nonce_str; | ||
| return nonce_str; | ||
| } | ||
|
|
||
| public String getSign() { | ||
| return this.sign; | ||
| return sign; | ||
| } | ||
|
|
||
| public String getResult_code() { | ||
| return this.result_code; | ||
| return result_code; | ||
| } | ||
|
|
||
| public String getErr_code() { | ||
| return this.err_code; | ||
| return err_code; | ||
| } | ||
|
|
||
| public String getErr_code_des() { | ||
| return this.err_code_des; | ||
| return err_code_des; | ||
| } | ||
|
|
||
| public String getTrade_state() { | ||
| return this.trade_state; | ||
| return trade_state; | ||
| } | ||
|
|
||
| public String getDevice_info() { | ||
| return this.device_info; | ||
| return device_info; | ||
| } | ||
|
|
||
| public String getOpenid() { | ||
| return this.openid; | ||
| return openid; | ||
| } | ||
|
|
||
| public String getIs_subscribe() { | ||
| return this.is_subscribe; | ||
| return is_subscribe; | ||
| } | ||
|
|
||
| public String getTrade_type() { | ||
| return this.trade_type; | ||
| return trade_type; | ||
| } | ||
|
|
||
| public String getBank_type() { | ||
| return this.bank_type; | ||
| return bank_type; | ||
| } | ||
|
|
||
| public String getTotal_fee() { | ||
| return this.total_fee; | ||
| return total_fee; | ||
| } | ||
|
|
||
| public String getCoupon_fee() { | ||
| return this.coupon_fee; | ||
| return coupon_fee; | ||
| } | ||
|
|
||
| public String getFee_type() { | ||
| return this.fee_type; | ||
| return fee_type; | ||
| } | ||
|
|
||
| public String getTransaction_id() { | ||
| return this.transaction_id; | ||
| return transaction_id; | ||
| } | ||
|
|
||
| public String getOut_trade_no() { | ||
| return this.out_trade_no; | ||
| return out_trade_no; | ||
| } | ||
|
|
||
| public String getAttach() { | ||
| return this.attach; | ||
| return attach; | ||
| } | ||
|
|
||
| public String getTime_end() { | ||
| return this.time_end; | ||
| return time_end; | ||
| } | ||
|
|
||
| public void setReturn_code(String return_code) { | ||
|
|
@@ -219,7 +228,7 @@ public void setTime_end(String time_end) { | |
| } | ||
|
|
||
| public String getTrade_state_desc() { | ||
| return this.trade_state_desc; | ||
| return trade_state_desc; | ||
| } | ||
|
|
||
| public void setTrade_state_desc(String trade_state_desc) { | ||
|
|
@@ -229,29 +238,57 @@ public void setTrade_state_desc(String trade_state_desc) { | |
| @Override | ||
| public String toString() { | ||
| return "WxMpPayResult{" + | ||
| "return_code=" + this.return_code + | ||
| ", return_msg='" + this.return_msg + '\'' + | ||
| ", appid='" + this.appid + '\'' + | ||
| ", mch_id='" + this.mch_id + '\'' + | ||
| ", nonce_str='" + this.nonce_str + '\'' + | ||
| ", sign='" + this.sign + '\'' + | ||
| ", result_code='" + this.result_code + '\'' + | ||
| ", err_code='" + this.err_code + '\'' + | ||
| ", err_code_des='" + this.err_code_des + '\'' + | ||
| ", trade_state=" + this.trade_state + | ||
| ", trade_state_desc=" + this.trade_state_desc + | ||
| ", device_info='" + this.device_info + '\'' + | ||
| ", openid='" + this.openid + '\'' + | ||
| ", is_subscribe='" + this.is_subscribe + '\'' + | ||
| ", trade_type='" + this.trade_type + '\'' + | ||
| ", bank_type='" + this.bank_type + '\'' + | ||
| ", total_fee='" + this.total_fee + '\'' + | ||
| ", coupon_fee='" + this.coupon_fee + '\'' + | ||
| ", fee_type='" + this.fee_type + '\'' + | ||
| ", transaction_id='" + this.transaction_id + '\'' + | ||
| ", out_trade_no='" + this.out_trade_no + '\'' + | ||
| ", attach='" + this.attach + '\'' + | ||
| ", time_end='" + this.time_end + '\'' + | ||
| "return_code=" + return_code + | ||
| ", return_msg='" + return_msg + '\'' + | ||
| ", appid='" + appid + '\'' + | ||
| ", mch_id='" + mch_id + '\'' + | ||
| ", nonce_str='" + nonce_str + '\'' + | ||
| ", sign='" + sign + '\'' + | ||
| ", result_code='" + result_code + '\'' + | ||
| ", err_code='" + err_code + '\'' + | ||
| ", err_code_des='" + err_code_des + '\'' + | ||
| ", trade_state=" + trade_state + | ||
| ", trade_state_desc=" + trade_state_desc + | ||
| ", device_info='" + device_info + '\'' + | ||
| ", openid='" + openid + '\'' + | ||
| ", is_subscribe='" + is_subscribe + '\'' + | ||
| ", trade_type='" + trade_type + '\'' + | ||
| ", bank_type='" + bank_type + '\'' + | ||
| ", total_fee='" + total_fee + '\'' + | ||
| ", coupon_fee='" + coupon_fee + '\'' + | ||
| ", fee_type='" + fee_type + '\'' + | ||
| ", transaction_id='" + transaction_id + '\'' + | ||
| ", out_trade_no='" + out_trade_no + '\'' + | ||
| ", attach='" + attach + '\'' + | ||
| ", time_end='" + time_end + '\'' + | ||
| '}'; | ||
| } | ||
|
|
||
| /** | ||
| * @return the cash_fee | ||
| */ | ||
| public String getCash_fee() { | ||
| return cash_fee; | ||
| } | ||
|
|
||
| /** | ||
| * @param cash_fee the cash_fee to set | ||
| */ | ||
| public void setCash_fee(String cash_fee) { | ||
| this.cash_fee = cash_fee; | ||
| } | ||
|
|
||
| /** | ||
| * @return the cash_fee_type | ||
| */ | ||
| public String getCash_fee_type() { | ||
| return cash_fee_type; | ||
| } | ||
|
|
||
| /** | ||
| * @param cash_fee_type the cash_fee_type to set | ||
| */ | ||
| public void setCash_fee_type(String cash_fee_type) { | ||
| this.cash_fee_type = cash_fee_type; | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
感谢提交,你的编辑器有保存时自动格式化所有代码的功能吗?为什么有这么多无关的修改?建议去掉格式化所有代码行的设置,仅格式化你自己添加修改的代码即可
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
这个格式我啥也没干,好像只是合并了某个分支还是怎么的,有这么多无关的提交,刚才发PR的时候也发现了,另外刚开始学习对别人的项目PR,操作还不太熟悉,不规范的地方多指正