server
/
formallProject
1
0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

[储值卡][修改]:goods_tag改为coupon_id

release_toaliyun_real
Stormeye Wu 7 years ago
parent
ac4f70defe
commit
2468ae65cb
13 changed files with 66 additions and 1057 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +3
    -96
      mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderP.java
  2. +3
    -128
      mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderSP.java
  3. +5
    -112
      mallinkService/src/main/java/com/iformall/pay/WxPayOrderP.java
  4. +3
    -41
      mallinkService/src/main/java/com/iformall/pay/WxPayOrderQ.java
  5. +3
    -152
      mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java
  6. +3
    -65
      mallinkService/src/main/java/com/iformall/pay/WxPayOrderSQ.java
  7. +3
    -75
      mallinkService/src/main/java/com/iformall/pay/WxProfitSharingFinishP.java
  8. +3
    -75
      mallinkService/src/main/java/com/iformall/pay/WxProfitSharingP.java
  9. +15
    -51
      mallinkService/src/main/java/com/iformall/pay/WxProfitSharingQueryP.java
  10. +16
    -61
      mallinkService/src/main/java/com/iformall/pay/WxProfitSharingReceiverP.java
  11. +3
    -88
      mallinkService/src/main/java/com/iformall/pay/WxRefundOrderP.java
  12. +3
    -112
      mallinkService/src/main/java/com/iformall/pay/WxRefundOrderSP.java
  13. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java

+ 3
- 96
mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderP.java View File

@@ -1,9 +1,12 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/11/7. * Created by Stormeye on 2018/11/7.
* 普通商户模式 * 普通商户模式
*/ */
@Data
public class WxMicroPayOrderP { public class WxMicroPayOrderP {
private String appid; // 小程序ID private String appid; // 小程序ID
private String mch_id; // 商户号 private String mch_id; // 商户号
@@ -18,102 +21,6 @@ public class WxMicroPayOrderP {
private String time_expire; // 失效时间 private String time_expire; // 失效时间
private String auth_code; // 扫码支付授权码 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxMicroPayOrderP{"); final StringBuilder sb = new StringBuilder("WxMicroPayOrderP{");


+ 3
- 128
mallinkService/src/main/java/com/iformall/pay/WxMicroPayOrderSP.java View File

@@ -1,9 +1,12 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/11/7. * Created by Stormeye on 2018/11/7.
* 服务商模式 * 服务商模式
*/ */
@Data
public class WxMicroPayOrderSP { public class WxMicroPayOrderSP {
private String appid; // 公众账号ID private String appid; // 公众账号ID
private String sub_appid; // 小程序ID private String sub_appid; // 小程序ID
@@ -22,134 +25,6 @@ public class WxMicroPayOrderSP {
private String auth_code; // 扫码支付授权码 private String auth_code; // 扫码支付授权码
private String profit_sharing; // 是否开启分账 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxMicroPayOrderSP {"); final StringBuilder sb = new StringBuilder("WxMicroPayOrderSP {");


+ 5
- 112
mallinkService/src/main/java/com/iformall/pay/WxPayOrderP.java View File

@@ -1,9 +1,12 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/8/10. * Created by Stormeye on 2018/8/10.
* 普通商户模式 * 普通商户模式
*/ */
@Data
public class WxPayOrderP { public class WxPayOrderP {
private String appid; // 小程序ID private String appid; // 小程序ID
private String mch_id; // 商户号 private String mch_id; // 商户号
@@ -13,6 +16,7 @@ public class WxPayOrderP {
private String out_trade_no; // 商户订单号 private String out_trade_no; // 商户订单号
private Integer total_fee; // 支付金额 private Integer total_fee; // 支付金额
private String spbill_create_ip; // 支付IP private String spbill_create_ip; // 支付IP
private String goods_tag; // 优惠标识
private String notify_url; // 通知地址 private String notify_url; // 通知地址
private String trade_type; // 支付类型 private String trade_type; // 支付类型
private String product_id; // 商品ID - 扫码必传 private String product_id; // 商品ID - 扫码必传
@@ -20,118 +24,6 @@ public class WxPayOrderP {
private String time_expire; // 失效时间 private String time_expire; // 失效时间
private String openid; // openId 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxPayOrderP{"); 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(", out_trade_no='").append(out_trade_no).append('\'');
sb.append(", total_fee=").append(total_fee); sb.append(", total_fee=").append(total_fee);
sb.append(", spbill_create_ip='").append(spbill_create_ip).append('\''); 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(", notify_url='").append(notify_url).append('\'');
sb.append(", trade_type='").append(trade_type).append('\''); sb.append(", trade_type='").append(trade_type).append('\'');
sb.append(", product_id='").append(product_id).append('\''); sb.append(", product_id='").append(product_id).append('\'');


+ 3
- 41
mallinkService/src/main/java/com/iformall/pay/WxPayOrderQ.java View File

@@ -1,8 +1,11 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/8/10. * Created by Stormeye on 2018/8/10.
*/ */
@Data
public class WxPayOrderQ { public class WxPayOrderQ {
private String appid; // 小程序ID private String appid; // 小程序ID
private String mch_id; // 商户号 private String mch_id; // 商户号
@@ -10,47 +13,6 @@ public class WxPayOrderQ {
private String sign; // 签名 private String sign; // 签名
private String out_trade_no; // 商户订单号 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxPayOrderQ{"); final StringBuilder sb = new StringBuilder("WxPayOrderQ{");


+ 3
- 152
mallinkService/src/main/java/com/iformall/pay/WxPayOrderSP.java View File

@@ -1,9 +1,12 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/8/10. * Created by Stormeye on 2018/8/10.
* 服务商模式 * 服务商模式
*/ */
@Data
public class WxPayOrderSP { public class WxPayOrderSP {
private String appid; // 公众账号ID private String appid; // 公众账号ID
private String sub_appid; // 小程序ID private String sub_appid; // 小程序ID
@@ -25,158 +28,6 @@ public class WxPayOrderSP {
private String sub_openid; // sub_openId private String sub_openid; // sub_openId
private String profit_sharing; // 是否开启分账 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxPayOrderSP{"); final StringBuilder sb = new StringBuilder("WxPayOrderSP{");


+ 3
- 65
mallinkService/src/main/java/com/iformall/pay/WxPayOrderSQ.java View File

@@ -1,8 +1,11 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/8/10. * Created by Stormeye on 2018/8/10.
*/ */
@Data
public class WxPayOrderSQ { public class WxPayOrderSQ {
private String appid; // 公众号ID private String appid; // 公众号ID
private String sub_appid; // 小程序ID private String sub_appid; // 小程序ID
@@ -13,71 +16,6 @@ public class WxPayOrderSQ {
private String sign_type; // 签名类型 private String sign_type; // 签名类型
private String out_trade_no; // 商户订单号 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxPayOrderSQ{"); final StringBuilder sb = new StringBuilder("WxPayOrderSQ{");


+ 3
- 75
mallinkService/src/main/java/com/iformall/pay/WxProfitSharingFinishP.java View File

@@ -1,10 +1,13 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

import java.io.Serializable; import java.io.Serializable;


/** /**
* Created by Peng on 2018/8/10. * Created by Peng on 2018/8/10.
*/ */
@Data
public class WxProfitSharingFinishP implements Serializable { public class WxProfitSharingFinishP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@@ -19,81 +22,6 @@ public class WxProfitSharingFinishP implements Serializable {
private Integer amount; // 商户分账金额 private Integer amount; // 商户分账金额
private String description; // 分账完结的原因描述 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxProfitSharingFinishP{"); final StringBuilder sb = new StringBuilder("WxProfitSharingFinishP{");


+ 3
- 75
mallinkService/src/main/java/com/iformall/pay/WxProfitSharingP.java View File

@@ -1,10 +1,13 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

import java.io.Serializable; import java.io.Serializable;


/** /**
* Created by Peng on 2018/8/10. * Created by Peng on 2018/8/10.
*/ */
@Data
public class WxProfitSharingP implements Serializable { public class WxProfitSharingP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@@ -19,81 +22,6 @@ public class WxProfitSharingP implements Serializable {
private String out_order_no; // 商户订单号 private String out_order_no; // 商户订单号
private String receivers; // 分账接收方 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxProfitSharingP{"); final StringBuilder sb = new StringBuilder("WxProfitSharingP{");


+ 15
- 51
mallinkService/src/main/java/com/iformall/pay/WxProfitSharingQueryP.java View File

@@ -1,10 +1,13 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

import java.io.Serializable; import java.io.Serializable;


/** /**
* Created by Peng on 2018/8/10. * Created by Peng on 2018/8/10.
*/ */
@Data
public class WxProfitSharingQueryP implements Serializable { public class WxProfitSharingQueryP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@@ -16,56 +19,17 @@ public class WxProfitSharingQueryP implements Serializable {
private String transaction_id ; // 支付订单号 private String transaction_id ; // 支付订单号
private String out_order_no; // 商户分账单号 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;
}

} }

+ 16
- 61
mallinkService/src/main/java/com/iformall/pay/WxProfitSharingReceiverP.java View File

@@ -1,10 +1,13 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

import java.io.Serializable; import java.io.Serializable;


/** /**
* Created by Peng on 2018/8/10. * Created by Peng on 2018/8/10.
*/ */
@Data
public class WxProfitSharingReceiverP implements Serializable { public class WxProfitSharingReceiverP implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;


@@ -17,66 +20,18 @@ public class WxProfitSharingReceiverP implements Serializable {
private String sign_type; // 签名方法 private String sign_type; // 签名方法
private String receiver; // 分账接收方 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;
}

} }

+ 3
- 88
mallinkService/src/main/java/com/iformall/pay/WxRefundOrderP.java View File

@@ -1,8 +1,11 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/8/10. * Created by Stormeye on 2018/8/10.
*/ */
@Data
public class WxRefundOrderP { public class WxRefundOrderP {
private String appid; // 小程序ID private String appid; // 小程序ID
private String mch_id; // 商户号 private String mch_id; // 商户号
@@ -16,94 +19,6 @@ public class WxRefundOrderP {
private String refund_desc; // 退款原因 private String refund_desc; // 退款原因
private String notify_url; // 回调接口 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxRefundOrder{"); final StringBuilder sb = new StringBuilder("WxRefundOrder{");


+ 3
- 112
mallinkService/src/main/java/com/iformall/pay/WxRefundOrderSP.java View File

@@ -1,8 +1,11 @@
package com.iformall.pay; package com.iformall.pay;


import lombok.Data;

/** /**
* Created by Stormeye on 2018/8/10. * Created by Stormeye on 2018/8/10.
*/ */
@Data
public class WxRefundOrderSP { public class WxRefundOrderSP {
private String appid; // 公众账号ID private String appid; // 公众账号ID
private String sub_appid; // 小程序ID private String sub_appid; // 小程序ID
@@ -19,118 +22,6 @@ public class WxRefundOrderSP {
private String refund_desc; // 退款原因 private String refund_desc; // 退款原因
private String notify_url; // 回调接口 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 @Override
public String toString() { public String toString() {
final StringBuilder sb = new StringBuilder("WxRefundOrder{"); final StringBuilder sb = new StringBuilder("WxRefundOrder{");


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxPayOrderServiceImpl.java View File

@@ -199,6 +199,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxPayOrderP.setOut_trade_no(record.getPayOrderNo()); wxPayOrderP.setOut_trade_no(record.getPayOrderNo());
wxPayOrderP.setTotal_fee(order.getPayment()); wxPayOrderP.setTotal_fee(order.getPayment());
wxPayOrderP.setSpbill_create_ip(record.getIp()); // 终端IP wxPayOrderP.setSpbill_create_ip(record.getIp()); // 终端IP
wxPayOrderP.setGoods_tag(String.valueOf(order.getProductId()));
wxPayOrderP.setNotify_url(payAccount.getPayNotifyUrl()); wxPayOrderP.setNotify_url(payAccount.getPayNotifyUrl());
wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型
wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID
@@ -272,7 +273,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxPayOrderSP.setOut_trade_no(record.getPayOrderNo()); wxPayOrderSP.setOut_trade_no(record.getPayOrderNo());
wxPayOrderSP.setTotal_fee(order.getPayment()); wxPayOrderSP.setTotal_fee(order.getPayment());
wxPayOrderSP.setSpbill_create_ip(record.getIp()); // 终端IP wxPayOrderSP.setSpbill_create_ip(record.getIp()); // 终端IP
wxPayOrderSP.setGoods_tag("chuzhika");
wxPayOrderSP.setGoods_tag(String.valueOf(order.getProductId()));
wxPayOrderSP.setNotify_url(payAccount.getPayNotifyUrl()); wxPayOrderSP.setNotify_url(payAccount.getPayNotifyUrl());
wxPayOrderSP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 wxPayOrderSP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型
wxPayOrderSP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderSP.setProduct_id(String.valueOf(order.getId())); // 订单ID
@@ -350,6 +351,7 @@ public class WxPayOrderServiceImpl implements WxPayOrderService {
wxPayOrderP.setOut_trade_no(record.getPayOrderNo()); wxPayOrderP.setOut_trade_no(record.getPayOrderNo());
wxPayOrderP.setTotal_fee(order.getPayment()); wxPayOrderP.setTotal_fee(order.getPayment());
wxPayOrderP.setSpbill_create_ip(record.getIp()); // 终端IP wxPayOrderP.setSpbill_create_ip(record.getIp()); // 终端IP
wxPayOrderP.setGoods_tag(String.valueOf(order.getProductId()));
wxPayOrderP.setNotify_url(payAccount.getPayNotifyUrl()); wxPayOrderP.setNotify_url(payAccount.getPayNotifyUrl());
wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型 wxPayOrderP.setTrade_type(WxPay.TradeType.JSAPI.name()); // 终端类型
wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID wxPayOrderP.setProduct_id(String.valueOf(order.getId())); // 订单ID


Write Preview
Loading…
Cancel
Save