From 2468ae65cb2026a5e1373aef7117401b5c253a3e Mon Sep 17 00:00:00 2001 From: Stormeye Wu Date: Thu, 20 Dec 2018 20:34:40 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=82=A8=E5=80=BC=E5=8D=A1][=E4=BF=AE?= =?UTF-8?q?=E6=94=B9]:goods=5Ftag=E6=94=B9=E4=B8=BAcoupon=5Fid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/iformall/pay/WxMicroPayOrderP.java | 99 +---------- .../com/iformall/pay/WxMicroPayOrderSP.java | 131 +-------------- .../java/com/iformall/pay/WxPayOrderP.java | 117 +------------ .../java/com/iformall/pay/WxPayOrderQ.java | 44 +---- .../java/com/iformall/pay/WxPayOrderSP.java | 155 +----------------- .../java/com/iformall/pay/WxPayOrderSQ.java | 68 +------- .../iformall/pay/WxProfitSharingFinishP.java | 78 +-------- .../com/iformall/pay/WxProfitSharingP.java | 78 +-------- .../iformall/pay/WxProfitSharingQueryP.java | 66 ++------ .../pay/WxProfitSharingReceiverP.java | 77 ++------- .../java/com/iformall/pay/WxRefundOrderP.java | 91 +--------- .../com/iformall/pay/WxRefundOrderSP.java | 115 +------------ .../service/impl/WxPayOrderServiceImpl.java | 4 +- 13 files changed, 66 insertions(+), 1057 deletions(-) diff --git a/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderP.java b/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderP.java index 5e70a556a..79073d506 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderP.java @@ -1,9 +1,12 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/11/7. * 普通商户模式 */ +@Data public class WxMicroPayOrderP { private String appid; // 小程序ID private String mch_id; // 商户号 @@ -18,102 +21,6 @@ public class WxMicroPayOrderP { private String time_expire; // 失效时间 private String auth_code; // 扫码支付授权码 - public String getTime_start() { - return time_start; - } - - public void setTime_start(String time_start) { - this.time_start = time_start; - } - - public String getTime_expire() { - return time_expire; - } - - public void setTime_expire(String time_expire) { - this.time_expire = time_expire; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getDevice_info() { - return device_info; - } - - public void setDevice_info(String device_info) { - this.device_info = device_info; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - - public Integer getTotal_fee() { - return total_fee; - } - - public void setTotal_fee(Integer total_fee) { - this.total_fee = total_fee; - } - - public String getSpbill_create_ip() { - return spbill_create_ip; - } - - public void setSpbill_create_ip(String spbill_create_ip) { - this.spbill_create_ip = spbill_create_ip; - } - - public String getAuth_code() { - return auth_code; - } - - public void setAuth_code(String auth_code) { - this.auth_code = auth_code; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxMicroPayOrderP{"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderSP.java b/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderSP.java index 1a7aea08c..8e228b055 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderSP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderSP.java @@ -1,9 +1,12 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/11/7. * 服务商模式 */ +@Data public class WxMicroPayOrderSP { private String appid; // 公众账号ID private String sub_appid; // 小程序ID @@ -22,134 +25,6 @@ public class WxMicroPayOrderSP { private String auth_code; // 扫码支付授权码 private String profit_sharing; // 是否开启分账 - public String getTime_start() { - return time_start; - } - - public void setTime_start(String time_start) { - this.time_start = time_start; - } - - public String getTime_expire() { - return time_expire; - } - - public void setTime_expire(String time_expire) { - this.time_expire = time_expire; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSub_appid() { - return sub_appid; - } - - public void setSub_appid(String sub_appid) { - this.sub_appid = sub_appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { - return sub_mch_id; - } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getDevice_info() { - return device_info; - } - - public void setDevice_info(String device_info) { - this.device_info = device_info; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - - public Integer getTotal_fee() { - return total_fee; - } - - public void setTotal_fee(Integer total_fee) { - this.total_fee = total_fee; - } - - public String getSpbill_create_ip() { - return spbill_create_ip; - } - - public void setSpbill_create_ip(String spbill_create_ip) { - this.spbill_create_ip = spbill_create_ip; - } - - public String getAuth_code() { - return auth_code; - } - - public void setAuth_code(String auth_code) { - this.auth_code = auth_code; - } - - public String getProfit_sharing() { - return profit_sharing; - } - - public void setProfit_sharing(String profit_sharing) { - this.profit_sharing = profit_sharing; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxMicroPayOrderSP {"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderP.java b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderP.java index e5c4fd1b6..b491581da 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderP.java @@ -1,9 +1,12 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/8/10. * 普通商户模式 */ +@Data public class WxPayOrderP { private String appid; // 小程序ID private String mch_id; // 商户号 @@ -13,6 +16,7 @@ public class WxPayOrderP { private String out_trade_no; // 商户订单号 private Integer total_fee; // 支付金额 private String spbill_create_ip; // 支付IP + private String goods_tag; // 优惠标识 private String notify_url; // 通知地址 private String trade_type; // 支付类型 private String product_id; // 商品ID - 扫码必传 @@ -20,118 +24,6 @@ public class WxPayOrderP { private String time_expire; // 失效时间 private String openid; // openId - public String getTime_start() { - return time_start; - } - - public void setTime_start(String time_start) { - this.time_start = time_start; - } - - public String getTime_expire() { - return time_expire; - } - - public void setTime_expire(String time_expire) { - this.time_expire = time_expire; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - - public Integer getTotal_fee() { - return total_fee; - } - - public void setTotal_fee(Integer total_fee) { - this.total_fee = total_fee; - } - - public String getSpbill_create_ip() { - return spbill_create_ip; - } - - public void setSpbill_create_ip(String spbill_create_ip) { - this.spbill_create_ip = spbill_create_ip; - } - - public String getNotify_url() { - return notify_url; - } - - public void setNotify_url(String notify_url) { - this.notify_url = notify_url; - } - - public String getTrade_type() { - return trade_type; - } - - public void setTrade_type(String trade_type) { - this.trade_type = trade_type; - } - - public String getProduct_id() { - return product_id; - } - - public void setProduct_id(String product_id) { - this.product_id = product_id; - } - - public String getOpenid() { - return openid; - } - - public void setOpenid(String openid) { - this.openid = openid; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxPayOrderP{"); @@ -143,6 +35,7 @@ public class WxPayOrderP { sb.append(", out_trade_no='").append(out_trade_no).append('\''); sb.append(", total_fee=").append(total_fee); sb.append(", spbill_create_ip='").append(spbill_create_ip).append('\''); + sb.append(", goods_tag='").append(goods_tag).append('\''); sb.append(", notify_url='").append(notify_url).append('\''); sb.append(", trade_type='").append(trade_type).append('\''); sb.append(", product_id='").append(product_id).append('\''); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderQ.java b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderQ.java index d1263bd38..e00512413 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderQ.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderQ.java @@ -1,8 +1,11 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/8/10. */ +@Data public class WxPayOrderQ { private String appid; // 小程序ID private String mch_id; // 商户号 @@ -10,47 +13,6 @@ public class WxPayOrderQ { private String sign; // 签名 private String out_trade_no; // 商户订单号 - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxPayOrderQ{"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java index ee87b5b82..a0c6219f5 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java @@ -1,9 +1,12 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/8/10. * 服务商模式 */ +@Data public class WxPayOrderSP { private String appid; // 公众账号ID private String sub_appid; // 小程序ID @@ -25,158 +28,6 @@ public class WxPayOrderSP { private String sub_openid; // sub_openId private String profit_sharing; // 是否开启分账 - public String getTime_start() { - return time_start; - } - - public void setTime_start(String time_start) { - this.time_start = time_start; - } - - public String getTime_expire() { - return time_expire; - } - - public void setTime_expire(String time_expire) { - this.time_expire = time_expire; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSub_appid() { - return sub_appid; - } - - public void setSub_appid(String sub_appid) { - this.sub_appid = sub_appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { - return sub_mch_id; - } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - - public String getBody() { - return body; - } - - public void setBody(String body) { - this.body = body; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - - public Integer getTotal_fee() { - return total_fee; - } - - public void setTotal_fee(Integer total_fee) { - this.total_fee = total_fee; - } - - public String getSpbill_create_ip() { - return spbill_create_ip; - } - - public void setSpbill_create_ip(String spbill_create_ip) { - this.spbill_create_ip = spbill_create_ip; - } - - public String getGoods_tag() { - return goods_tag; - } - - public void setGoods_tag(String goods_tag) { - this.goods_tag = goods_tag; - } - - public String getNotify_url() { - return notify_url; - } - - public void setNotify_url(String notify_url) { - this.notify_url = notify_url; - } - - public String getTrade_type() { - return trade_type; - } - - public void setTrade_type(String trade_type) { - this.trade_type = trade_type; - } - - public String getProduct_id() { - return product_id; - } - - public void setProduct_id(String product_id) { - this.product_id = product_id; - } - - public String getSub_openid() { - return sub_openid; - } - - public void setSub_openid(String sub_openid) { - this.sub_openid = sub_openid; - } - - public String getProfit_sharing() { - return profit_sharing; - } - - public void setProfit_sharing(String profit_sharing) { - this.profit_sharing = profit_sharing; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxPayOrderSP{"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSQ.java b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSQ.java index 3653e32c6..4143b8697 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSQ.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxPayOrderSQ.java @@ -1,8 +1,11 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/8/10. */ +@Data public class WxPayOrderSQ { private String appid; // 公众号ID private String sub_appid; // 小程序ID @@ -13,71 +16,6 @@ public class WxPayOrderSQ { private String sign_type; // 签名类型 private String out_trade_no; // 商户订单号 - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSub_appid() { - return sub_appid; - } - - public void setSub_appid(String sub_appid) { - this.sub_appid = sub_appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { - return sub_mch_id; - } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxPayOrderSQ{"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingFinishP.java b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingFinishP.java index 0943c2df5..8e18f1e7f 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingFinishP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingFinishP.java @@ -1,10 +1,13 @@ package com.iformall.pay; +import lombok.Data; + import java.io.Serializable; /** * Created by Peng on 2018/8/10. */ +@Data public class WxProfitSharingFinishP implements Serializable { private static final long serialVersionUID = 1L; @@ -19,81 +22,6 @@ public class WxProfitSharingFinishP implements Serializable { private Integer amount; // 商户分账金额 private String description; // 分账完结的原因描述 - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { return sub_mch_id; } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - public String getTransaction_id() { - return transaction_id; - } - - public void setTransaction_id(String transaction_id) { - this.transaction_id = transaction_id; - } - - public String getOut_order_no() { return out_order_no; } - - public void setOut_order_no(String out_order_no) { - this.out_order_no = out_order_no; - } - - public Integer getAmount() { - return amount; - } - - public void setAmount(Integer amount) { - this.amount = amount; - } - - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxProfitSharingFinishP{"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingP.java b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingP.java index 6e3f5d63f..00d5f33cb 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingP.java @@ -1,10 +1,13 @@ package com.iformall.pay; +import lombok.Data; + import java.io.Serializable; /** * Created by Peng on 2018/8/10. */ +@Data public class WxProfitSharingP implements Serializable { private static final long serialVersionUID = 1L; @@ -19,81 +22,6 @@ public class WxProfitSharingP implements Serializable { private String out_order_no; // 商户订单号 private String receivers; // 分账接收方 - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { return sub_mch_id; } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSub_appid() { - return sub_appid; - } - - public void setSub_appid(String sub_appid) { - this.sub_appid = sub_appid; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - public String getTransaction_id() { - return transaction_id; - } - - public void setTransaction_id(String transaction_id) { - this.transaction_id = transaction_id; - } - - public String getOut_order_no() { return out_order_no; } - - public void setOut_order_no(String out_order_no) { - this.out_order_no = out_order_no; - } - - public String getReceivers() { - return receivers; - } - - public void setReceivers(String receivers) { - this.receivers = receivers; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxProfitSharingP{"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingQueryP.java b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingQueryP.java index 60cd395c6..80b0ef4c3 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingQueryP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingQueryP.java @@ -1,10 +1,13 @@ package com.iformall.pay; +import lombok.Data; + import java.io.Serializable; /** * Created by Peng on 2018/8/10. */ +@Data public class WxProfitSharingQueryP implements Serializable { private static final long serialVersionUID = 1L; @@ -16,56 +19,17 @@ public class WxProfitSharingQueryP implements Serializable { private String transaction_id ; // 支付订单号 private String out_order_no; // 商户分账单号 - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { return sub_mch_id; } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("WxProfitSharingQueryP {"); + sb.append("mch_id='").append(mch_id).append('\''); + sb.append(", sub_mch_id='").append(sub_mch_id).append('\''); + sb.append(", nonce_str='").append(nonce_str).append('\''); + sb.append(", sign='").append(sign).append('\''); + sb.append(", sign_type='").append(sign_type).append('\''); + sb.append(", transaction_id='").append(transaction_id).append('\''); + sb.append(", out_order_no='").append(out_order_no).append('\''); + sb.append('}'); + return sb.toString(); } - - public void setSign(String sign) { - this.sign = sign; - } - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - - public String getTransaction_id() { - return transaction_id; - } - - public void setTransaction_id(String transaction_id) { - this.transaction_id = transaction_id; - } - - public String getOut_order_no() { return out_order_no; } - - public void setOut_order_no(String out_order_no) { - this.out_order_no = out_order_no; - } - } diff --git a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingReceiverP.java b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingReceiverP.java index 7cba93dcc..55b4f6510 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingReceiverP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxProfitSharingReceiverP.java @@ -1,10 +1,13 @@ package com.iformall.pay; +import lombok.Data; + import java.io.Serializable; /** * Created by Peng on 2018/8/10. */ +@Data public class WxProfitSharingReceiverP implements Serializable { private static final long serialVersionUID = 1L; @@ -17,66 +20,18 @@ public class WxProfitSharingReceiverP implements Serializable { private String sign_type; // 签名方法 private String receiver; // 分账接收方 - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { return sub_mch_id; } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSub_appid() { - return sub_appid; - } - - public void setSub_appid(String sub_appid) { - this.sub_appid = sub_appid; - } - - public String getNonce_str() { - return nonce_str; + @Override + public String toString() { + final StringBuilder sb = new StringBuilder("WxProfitSharingReceiverP {"); + sb.append("mch_id='").append(mch_id).append('\''); + sb.append(", sub_mch_id='").append(sub_mch_id).append('\''); + sb.append(", appid='").append(appid).append('\''); + sb.append(", sub_appid='").append(sub_appid).append('\''); + sb.append(", nonce_str='").append(nonce_str).append('\''); + sb.append(", sign='").append(sign).append('\''); + sb.append(", sign_type='").append(sign_type).append('\''); + sb.append(", receiver='").append(receiver).append('\''); + sb.append('}'); + return sb.toString(); } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - - public String getReceiver() { - return receiver; - } - - public void setReceiver(String receiver) { - this.receiver = receiver; - } - } diff --git a/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderP.java b/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderP.java index d0370496e..2f91e0ee4 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderP.java @@ -1,8 +1,11 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/8/10. */ +@Data public class WxRefundOrderP { private String appid; // 小程序ID private String mch_id; // 商户号 @@ -16,94 +19,6 @@ public class WxRefundOrderP { private String refund_desc; // 退款原因 private String notify_url; // 回调接口 - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getTransaction_id() { - return transaction_id; - } - - public void setTransaction_id(String transaction_id) { - this.transaction_id = transaction_id; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - - public String getOut_refund_no() { - return out_refund_no; - } - - public void setOut_refund_no(String out_refund_no) { - this.out_refund_no = out_refund_no; - } - - public Integer getTotal_fee() { - return total_fee; - } - - public void setTotal_fee(Integer total_fee) { - this.total_fee = total_fee; - } - - public Integer getRefund_fee() { - return refund_fee; - } - - public void setRefund_fee(Integer refund_fee) { - this.refund_fee = refund_fee; - } - - public String getRefund_desc() { - return refund_desc; - } - - public void setRefund_desc(String refund_desc) { - this.refund_desc = refund_desc; - } - - public String getNotify_url() { - return notify_url; - } - - public void setNotify_url(String notify_url) { - this.notify_url = notify_url; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxRefundOrder{"); diff --git a/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderSP.java b/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderSP.java index c3a1ff503..5f5157f63 100644 --- a/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderSP.java +++ b/mallinkService/src/main/java/com/iformall/pay/WxRefundOrderSP.java @@ -1,8 +1,11 @@ package com.iformall.pay; +import lombok.Data; + /** * Created by Stormeye on 2018/8/10. */ +@Data public class WxRefundOrderSP { private String appid; // 公众账号ID private String sub_appid; // 小程序ID @@ -19,118 +22,6 @@ public class WxRefundOrderSP { private String refund_desc; // 退款原因 private String notify_url; // 回调接口 - public String getAppid() { - return appid; - } - - public void setAppid(String appid) { - this.appid = appid; - } - - public String getSub_appid() { - return sub_appid; - } - - public void setSub_appid(String sub_appid) { - this.sub_appid = sub_appid; - } - - public String getMch_id() { - return mch_id; - } - - public void setMch_id(String mch_id) { - this.mch_id = mch_id; - } - - public String getSub_mch_id() { - return sub_mch_id; - } - - public void setSub_mch_id(String sub_mch_id) { - this.sub_mch_id = sub_mch_id; - } - - public String getNonce_str() { - return nonce_str; - } - - public void setNonce_str(String nonce_str) { - this.nonce_str = nonce_str; - } - - public String getSign() { - return sign; - } - - public void setSign(String sign) { - this.sign = sign; - } - - public String getSign_type() { - return sign_type; - } - - public void setSign_type(String sign_type) { - this.sign_type = sign_type; - } - - public String getTransaction_id() { - return transaction_id; - } - - public void setTransaction_id(String transaction_id) { - this.transaction_id = transaction_id; - } - - public String getOut_trade_no() { - return out_trade_no; - } - - public void setOut_trade_no(String out_trade_no) { - this.out_trade_no = out_trade_no; - } - - public String getOut_refund_no() { - return out_refund_no; - } - - public void setOut_refund_no(String out_refund_no) { - this.out_refund_no = out_refund_no; - } - - public Integer getTotal_fee() { - return total_fee; - } - - public void setTotal_fee(Integer total_fee) { - this.total_fee = total_fee; - } - - public Integer getRefund_fee() { - return refund_fee; - } - - public void setRefund_fee(Integer refund_fee) { - this.refund_fee = refund_fee; - } - - public String getRefund_desc() { - return refund_desc; - } - - public void setRefund_desc(String refund_desc) { - this.refund_desc = refund_desc; - } - - public String getNotify_url() { - return notify_url; - } - - public void setNotify_url(String notify_url) { - this.notify_url = notify_url; - } - @Override public String toString() { final StringBuilder sb = new StringBuilder("WxRefundOrder{"); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java index ccb4fb9c0..468943b03 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java @@ -199,6 +199,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderP.setOut_trade_no(record.getPayOrderNo()); wxPayOrderP.setTotal_fee(order.getPayment()); wxPayOrderP.setSpbill_create_ip(record.getIp()); // 终端IP + wxPayOrderP.setGoods_tag(String.valueOf(order.getProductId())); wxPayOrderP.setNotify_url(payAccount.getPayNotifyUrl()); wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID @@ -272,7 +273,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderSP.setOut_trade_no(record.getPayOrderNo()); wxPayOrderSP.setTotal_fee(order.getPayment()); wxPayOrderSP.setSpbill_create_ip(record.getIp()); // 终端IP - wxPayOrderSP.setGoods_tag("chuzhika"); + wxPayOrderSP.setGoods_tag(String.valueOf(order.getProductId())); wxPayOrderSP.setNotify_url(payAccount.getPayNotifyUrl()); wxPayOrderSP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 wxPayOrderSP.setProduct_id(String.valueOf(order.getId())); // 订单ID @@ -350,6 +351,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService { wxPayOrderP.setOut_trade_no(record.getPayOrderNo()); wxPayOrderP.setTotal_fee(order.getPayment()); wxPayOrderP.setSpbill_create_ip(record.getIp()); // 终端IP + wxPayOrderP.setGoods_tag(String.valueOf(order.getProductId())); wxPayOrderP.setNotify_url(payAccount.getPayNotifyUrl()); wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID