Skip to content

Commit

Permalink
#200 统一下单API、付款码支付API、委托扣款API中上传新增参数profit_sharing,请求支付
Browse files Browse the repository at this point in the history
  • Loading branch information
liyi committed May 10, 2019
1 parent 777d5e5 commit 9428ddf
Show file tree
Hide file tree
Showing 8 changed files with 197 additions and 8 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ weixin-popular 已支持的微信平台
<dependency>
<groupId>com.github.liyiorg</groupId>
<artifactId>weixin-popular</artifactId>
<version>2.8.27-SNAPSHOT</version>
<version>2.8.27</version>
</dependency>
```
* [升级注意事项](https://github.com/liyiorg/weixin-popular/wiki/jar_update)
Expand Down
3 changes: 2 additions & 1 deletion changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ WEIXIN-POPULAR CHANGELOG
===========================
https://github.com/liyiorg/weixin-popular

Changes in version 2.8.27 (2019-04-?)
Changes in version 2.8.27 (2019-05-10)
-------------------------------------
* #198 MenuAPI 创建个性化菜单返回menuid
* #200 统一下单API、付款码支付API、委托扣款API中上传新增参数profit_sharing,请求支付


Changes in version 2.8.26 (2019-02-22)
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<groupId>com.github.liyiorg</groupId>
<artifactId>weixin-popular</artifactId>
<version>2.8.27-SNAPSHOT</version>
<version>2.8.27</version>

<name>weixin-popular</name>
<description>The weixin-popular is a JAVA SDK for weixin. Weixin web url is https://mp.weixin.qq.com.</description>
Expand Down
4 changes: 4 additions & 0 deletions src/main/java/weixin/popular/api/PayMchAPI.java
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,10 @@ public static MicropayResult payMicropay(Micropay micropay,String key){
if(micropay.getDetail() != null){
map.put("detail",JsonUtil.toJSONString(micropay.getDetail()));
}
//@since 2.8.27 scene_info 字段签名处理
if(micropay.getScene_info() != null){
map.put("scene_info",JsonUtil.toJSONString(micropay.getScene_info()));
}
String sign = SignatureUtil.generateSign(map,micropay.getSign_type(),key);
micropay.setSign(sign);
String closeorderXML = XMLConverUtil.convertToXML(micropay);
Expand Down
86 changes: 81 additions & 5 deletions src/main/java/weixin/popular/bean/paymch/Micropay.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import java.math.BigDecimal;

@XmlRootElement(name="xml")
@XmlRootElement(name = "xml")
@XmlAccessorType(XmlAccessType.FIELD)
public class Micropay extends MchVersion{
public class Micropay extends MchVersion {

private String appid;
private String mch_id;
Expand All @@ -31,9 +31,9 @@ public class Micropay extends MchVersion{
private String fee_type;
private String spbill_create_ip;
private String goods_tag;
private String limit_pay; //指定支付方式 no_credit 指定不能使用信用卡支付
private String limit_pay; // 指定支付方式 no_credit 指定不能使用信用卡支付
private String auth_code;

/**
* @since 2.8.5
*/
Expand All @@ -44,63 +44,98 @@ public class Micropay extends MchVersion{
*/
protected String sub_mch_id;

/**
* @since 2.8.27
*/
@XmlJavaTypeAdapter(value = SceneInfo.JsonXmlAdapter.class)
private SceneInfo scene_info;

/**
* @since 2.8.27
*/
private String receipt;

/**
* @since 2.8.27
*/
private String profit_sharing;

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 Detail getDetail() {
return detail;
}

public void setDetail(Detail detail) {
this.detail = detail;
}

public String getAttach() {
return attach;
}

public void setAttach(String attach) {
this.attach = attach;
}

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;
}
Expand All @@ -116,55 +151,96 @@ public void setOrder_amount(BigDecimal order_amount) {
public String getFee_type() {
return fee_type;
}

public void setFee_type(String fee_type) {
this.fee_type = fee_type;
}

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 getAuth_code() {
return auth_code;
}

public void setAuth_code(String auth_code) {
this.auth_code = auth_code;
}

public String getLimit_pay() {
return limit_pay;
}

public void setLimit_pay(String limit_pay) {
this.limit_pay = limit_pay;
}

public String getSub_appid() {
return sub_appid;
}

public void setSub_appid(String sub_appid) {
this.sub_appid = sub_appid;
}

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 getSign_type() {
return sign_type;
}

/**
* 签名类型
*
* @since 2.8.5
* @param sign_type HMAC-SHA256和MD5
* @param sign_type
* HMAC-SHA256和MD5
*/
public void setSign_type(String sign_type) {
this.sign_type = sign_type;
}

public SceneInfo getScene_info() {
return scene_info;
}

public void setScene_info(SceneInfo scene_info) {
this.scene_info = scene_info;
}

public String getReceipt() {
return receipt;
}

public void setReceipt(String receipt) {
this.receipt = receipt;
}

public String getProfit_sharing() {
return profit_sharing;
}

public void setProfit_sharing(String profit_sharing) {
this.profit_sharing = profit_sharing;
}

}
26 changes: 26 additions & 0 deletions src/main/java/weixin/popular/bean/paymch/Pappayapply.java
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,16 @@ public class Pappayapply {
private String outerid;

private String sign_type;

/**
* @since 2.8.27
*/
private String receipt;

/**
* @since 2.8.27
*/
private String profit_sharing;

public String getAppid() {
return appid;
Expand Down Expand Up @@ -265,4 +275,20 @@ public void setSign_type(String sign_type) {
this.sign_type = sign_type;
}

public String getReceipt() {
return receipt;
}

public void setReceipt(String receipt) {
this.receipt = receipt;
}

public String getProfit_sharing() {
return profit_sharing;
}

public void setProfit_sharing(String profit_sharing) {
this.profit_sharing = profit_sharing;
}

}
54 changes: 54 additions & 0 deletions src/main/java/weixin/popular/bean/paymch/SceneInfo.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ public class SceneInfo {

private H5Info h5_info;

private StoreInfo store_info;

public H5Info getH5_info() {
return h5_info;
}
Expand All @@ -16,6 +18,14 @@ public void setH5_info(H5Info h5_info) {
this.h5_info = h5_info;
}

public StoreInfo getStore_info() {
return store_info;
}

public void setStore_info(StoreInfo store_info) {
this.store_info = store_info;
}

public static class H5Info {

private String type;
Expand Down Expand Up @@ -69,6 +79,50 @@ public void setWap_name(String wap_name) {
}
}

public static class StoreInfo {

private String id;

private String name;

private String area_code;

private String address;

public String getId() {
return id;
}

public void setId(String id) {
this.id = id;
}

public String getName() {
return name;
}

public void setName(String name) {
this.name = name;
}

public String getArea_code() {
return area_code;
}

public void setArea_code(String area_code) {
this.area_code = area_code;
}

public String getAddress() {
return address;
}

public void setAddress(String address) {
this.address = address;
}

}

static class JsonXmlAdapter extends XmlAdapter<String, SceneInfo> {

@Override
Expand Down
Loading

0 comments on commit 9428ddf

Please sign in to comment.