hurui
/
hai-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

Browse Source
dev-discount
胡锐 3 years ago
parent 6c9a5b11da
commit 85cb55f8f9
7 changed files with 253 additions and 6 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 42
      hai-bweb/src/main/java/com/bweb/controller/HighMerchantTripartitePlatformController.java
  2. 2
      hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java
  3. 4
      hai-service/src/main/java/com/hai/common/utils/HttpsUtils.java
  4. 11
      hai-service/src/main/java/com/hai/dao/HighMerchantTripartitePlatformMapper.java
  5. 28
      hai-service/src/main/java/com/hai/dao/HighMerchantTripartitePlatformSqlProvider.java
  6. 32
      hai-service/src/main/java/com/hai/entity/HighMerchantTripartitePlatform.java
  7. 140
      hai-service/src/main/java/com/hai/entity/HighMerchantTripartitePlatformExample.java

42
hai-bweb/src/main/java/com/bweb/controller/HighMerchantTripartitePlatformController.java
Unescape View File

@ -4,9 +4,14 @@ import com.alibaba.fastjson.JSONObject;
import com.hai.common.exception.ErrorCode;
import com.hai.common.exception.ErrorHelp;
import com.hai.common.exception.SysCode;
import com.hai.common.pay.util.XmlUtil;
import com.hai.common.pay.util.sdk.WXPayConstants;
import com.hai.common.utils.HttpsUtils;
import com.hai.common.utils.ResponseMsgUtil;
import com.hai.common.utils.WxUtils;
import com.hai.entity.HighMerchantTripartitePlatform;
import com.hai.model.ResponseData;
import com.hai.model.WxSharingReceiversVO;
import com.hai.service.HighMerchantTripartitePlatformService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@ -18,6 +23,9 @@ import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.util.HashMap;
import java.util.Map;
import java.util.SortedMap;
@Controller
@RequestMapping(value = "/merchantTripartitePlatform")
@ -45,14 +53,17 @@ public class HighMerchantTripartitePlatformController {
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
if (body.getBoolean("profitSharingStatus") == true && body.getBigDecimal("profitSharingRatio") == null) {
if (body.getBoolean("profitSharingStatus") == true &&
(body.getBigDecimal("profitSharingRatio") == null ||
StringUtils.isBlank(body.getString("profitSharingReceiversNumber"))) ||
StringUtils.isBlank(body.getString("profitSharingReceiversName"))) {
log.error("HighMerchantController -> insertMerchantStore() error!","");
throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
}
HighMerchantTripartitePlatform platform = tripartitePlatformService.getDetail(body.getLong("merId"), body.getInteger("platformType"));
if (platform == null) {
platform = new HighMerchantTripartitePlatform();
}
platform.setMerId(body.getLong("merId"));
platform.setPlatformType(body.getInteger("platformType"));
@ -60,6 +71,33 @@ public class HighMerchantTripartitePlatformController {
platform.setPlatformMerNumber(body.getString("platformMerNumber"));
platform.setProfitSharingStatus(body.getBoolean("profitSharingStatus"));
platform.setProfitSharingRatio(body.getBigDecimal("profitSharingRatio"));
platform.setProfitSharingReceiversNumber(body.getString("profitSharingReceiversNumber"));
platform.setProfitSharingReceiversName(body.getString("profitSharingReceiversName"));
// 微信平台
if (platform.getPlatformType().equals(1)) {
WxSharingReceiversVO receiversVO = new WxSharingReceiversVO();
receiversVO.setAccount(platform.getProfitSharingReceiversNumber());
receiversVO.setType("MERCHANT_ID");
receiversVO.setName(platform.getProfitSharingReceiversName());
receiversVO.setRelation_type("SERVICE_PROVIDER");
Map<String , String> map = new HashMap<>();
map.put("mch_id" , "1289663601"); // 服务商
map.put("sub_mch_id" , platform.getPlatformMerNumber());
map.put("appid" , "wxa075e8509802f826");
map.put("nonce_str" , WxUtils.makeNonStr());
map.put("sign_type" , "HMAC-SHA256");
map.put("receiver" , JSONObject.toJSONString(receiversVO));
String sign = WxUtils.generateSignature(map, "Skufk5oi85wDFGl888i6wsRSTkdd5df5" , WXPayConstants.SignType.HMACSHA256);
map.put("sign" , sign);
String notifyXml = HttpsUtils.postData("https://api.mch.weixin.qq.com/pay/profitsharingaddreceiver", WxUtils.mapToXml(map));
SortedMap<String, String> postData = XmlUtil.parseXmlToTreeMap(notifyXml, "UTF-8");
if (!postData.get("result_code").equals("SUCCESS")) {
log.error("HighMerchantController -> editTripartitePlatform() error!", postData.get("err_code_des"));
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, postData.get("err_code_des"));
}
}
tripartitePlatformService.editDate(platform);
return ResponseMsgUtil.success("操作成功");

2
hai-cweb/src/main/java/com/cweb/controller/pay/OrderController.java
Unescape View File

@ -214,7 +214,7 @@ public class OrderController {
weChatPayReqInfo.setSub_mch_id(SysConst.getSysConfig().getWxGzSubMchId());//商户号
} else if (order.getHighChildOrderList().get(0).getGoodsType() == 3) {
weChatPayReqInfo.setSub_mch_id("1624126902"); // 浩联商户号
weChatPayReqInfo.setSub_mch_id("1609882817"); // 浩联商户号
profitSharing = "Y";
// 查询油站

4
hai-service/src/main/java/com/hai/common/utils/HttpsUtils.java
Unescape View File

@ -709,7 +709,7 @@ public class HttpsUtils {
* @Param [url, str]
* @return com.alibaba.fastjson.JSONObject
**/
public static JSONObject postData(String url, String str) {
public static String postData(String url, String str) {
CloseableHttpClient httpClient = null;
if (url.startsWith("https")) {
httpClient = HttpClients.custom().setSSLSocketFactory(createSSLConnSocketFactory())
@ -731,7 +731,7 @@ public class HttpsUtils {
response = httpClient.execute(httpPost);
HttpEntity entity = response.getEntity();
httpStr = EntityUtils.toString(entity, "UTF-8");
return JSON.parseObject(httpStr);
return httpStr;
} catch (Exception e) {
log.error(e.getMessage(),e);
} finally {

11
hai-service/src/main/java/com/hai/dao/HighMerchantTripartitePlatformMapper.java
Unescape View File

@ -42,12 +42,14 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
"insert into high_merchant_tripartite_platform (mer_id, platform_type, ",
"platform_mer_name, platform_mer_number, ",
"profit_sharing_status, profit_sharing_ratio, ",
"profit_sharing_receivers_number, profit_sharing_receivers_name, ",
"`status`, create_time, ",
"update_time, ext_1, ",
"ext_2, ext_3)",
"values (#{merId,jdbcType=BIGINT}, #{platformType,jdbcType=INTEGER}, ",
"#{platformMerName,jdbcType=VARCHAR}, #{platformMerNumber,jdbcType=VARCHAR}, ",
"#{profitSharingStatus,jdbcType=BIT}, #{profitSharingRatio,jdbcType=DECIMAL}, ",
"#{profitSharingReceiversNumber,jdbcType=VARCHAR}, #{profitSharingReceiversName,jdbcType=VARCHAR}, ",
"#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ",
"#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
"#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
@ -68,6 +70,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
@Result(column="platform_mer_number", property="platformMerNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
@Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
@Result(column="profit_sharing_receivers_number", property="profitSharingReceiversNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_receivers_name", property="profitSharingReceiversName", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -80,7 +84,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
@Select({
"select",
"id, mer_id, platform_type, platform_mer_name, platform_mer_number, profit_sharing_status, ",
"profit_sharing_ratio, `status`, create_time, update_time, ext_1, ext_2, ext_3",
"profit_sharing_ratio, profit_sharing_receivers_number, profit_sharing_receivers_name, ",
"`status`, create_time, update_time, ext_1, ext_2, ext_3",
"from high_merchant_tripartite_platform",
"where id = #{id,jdbcType=BIGINT}"
})
@ -92,6 +97,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
@Result(column="platform_mer_number", property="platformMerNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_status", property="profitSharingStatus", jdbcType=JdbcType.BIT),
@Result(column="profit_sharing_ratio", property="profitSharingRatio", jdbcType=JdbcType.DECIMAL),
@Result(column="profit_sharing_receivers_number", property="profitSharingReceiversNumber", jdbcType=JdbcType.VARCHAR),
@Result(column="profit_sharing_receivers_name", property="profitSharingReceiversName", jdbcType=JdbcType.VARCHAR),
@Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
@Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
@Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
@ -118,6 +125,8 @@ public interface HighMerchantTripartitePlatformMapper extends HighMerchantTripar
"platform_mer_number = #{platformMerNumber,jdbcType=VARCHAR},",
"profit_sharing_status = #{profitSharingStatus,jdbcType=BIT},",
"profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL},",
"profit_sharing_receivers_number = #{profitSharingReceiversNumber,jdbcType=VARCHAR},",
"profit_sharing_receivers_name = #{profitSharingReceiversName,jdbcType=VARCHAR},",
"`status` = #{status,jdbcType=INTEGER},",
"create_time = #{createTime,jdbcType=TIMESTAMP},",
"update_time = #{updateTime,jdbcType=TIMESTAMP},",

28
hai-service/src/main/java/com/hai/dao/HighMerchantTripartitePlatformSqlProvider.java
Unescape View File

@ -52,6 +52,14 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.VALUES("profit_sharing_ratio", "#{profitSharingRatio,jdbcType=DECIMAL}");
}
if (record.getProfitSharingReceiversNumber() != null) {
sql.VALUES("profit_sharing_receivers_number", "#{profitSharingReceiversNumber,jdbcType=VARCHAR}");
}
if (record.getProfitSharingReceiversName() != null) {
sql.VALUES("profit_sharing_receivers_name", "#{profitSharingReceiversName,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.VALUES("`status`", "#{status,jdbcType=INTEGER}");
}
@ -92,6 +100,8 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SELECT("platform_mer_number");
sql.SELECT("profit_sharing_status");
sql.SELECT("profit_sharing_ratio");
sql.SELECT("profit_sharing_receivers_number");
sql.SELECT("profit_sharing_receivers_name");
sql.SELECT("`status`");
sql.SELECT("create_time");
sql.SELECT("update_time");
@ -143,6 +153,14 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}");
}
if (record.getProfitSharingReceiversNumber() != null) {
sql.SET("profit_sharing_receivers_number = #{record.profitSharingReceiversNumber,jdbcType=VARCHAR}");
}
if (record.getProfitSharingReceiversName() != null) {
sql.SET("profit_sharing_receivers_name = #{record.profitSharingReceiversName,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
}
@ -182,6 +200,8 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SET("platform_mer_number = #{record.platformMerNumber,jdbcType=VARCHAR}");
sql.SET("profit_sharing_status = #{record.profitSharingStatus,jdbcType=BIT}");
sql.SET("profit_sharing_ratio = #{record.profitSharingRatio,jdbcType=DECIMAL}");
sql.SET("profit_sharing_receivers_number = #{record.profitSharingReceiversNumber,jdbcType=VARCHAR}");
sql.SET("profit_sharing_receivers_name = #{record.profitSharingReceiversName,jdbcType=VARCHAR}");
sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
@ -222,6 +242,14 @@ public class HighMerchantTripartitePlatformSqlProvider {
sql.SET("profit_sharing_ratio = #{profitSharingRatio,jdbcType=DECIMAL}");
}
if (record.getProfitSharingReceiversNumber() != null) {
sql.SET("profit_sharing_receivers_number = #{profitSharingReceiversNumber,jdbcType=VARCHAR}");
}
if (record.getProfitSharingReceiversName() != null) {
sql.SET("profit_sharing_receivers_name = #{profitSharingReceiversName,jdbcType=VARCHAR}");
}
if (record.getStatus() != null) {
sql.SET("`status` = #{status,jdbcType=INTEGER}");
}

32
hai-service/src/main/java/com/hai/entity/HighMerchantTripartitePlatform.java
Unescape View File

@ -46,6 +46,16 @@ public class HighMerchantTripartitePlatform implements Serializable {
*/
private BigDecimal profitSharingRatio;
/**
* 分账接收方账户
*/
private String profitSharingReceiversNumber;
/**
* 分账接收方名称
*/
private String profitSharingReceiversName;
/**
* 状态 0：删除 1：正常
*/
@ -125,6 +135,22 @@ public class HighMerchantTripartitePlatform implements Serializable {
this.profitSharingRatio = profitSharingRatio;
}
public String getProfitSharingReceiversNumber() {
return profitSharingReceiversNumber;
}
public void setProfitSharingReceiversNumber(String profitSharingReceiversNumber) {
this.profitSharingReceiversNumber = profitSharingReceiversNumber;
}
public String getProfitSharingReceiversName() {
return profitSharingReceiversName;
}
public void setProfitSharingReceiversName(String profitSharingReceiversName) {
this.profitSharingReceiversName = profitSharingReceiversName;
}
public Integer getStatus() {
return status;
}
@ -192,6 +218,8 @@ public class HighMerchantTripartitePlatform implements Serializable {
&& (this.getPlatformMerNumber() == null ? other.getPlatformMerNumber() == null : this.getPlatformMerNumber().equals(other.getPlatformMerNumber()))
&& (this.getProfitSharingStatus() == null ? other.getProfitSharingStatus() == null : this.getProfitSharingStatus().equals(other.getProfitSharingStatus()))
&& (this.getProfitSharingRatio() == null ? other.getProfitSharingRatio() == null : this.getProfitSharingRatio().equals(other.getProfitSharingRatio()))
&& (this.getProfitSharingReceiversNumber() == null ? other.getProfitSharingReceiversNumber() == null : this.getProfitSharingReceiversNumber().equals(other.getProfitSharingReceiversNumber()))
&& (this.getProfitSharingReceiversName() == null ? other.getProfitSharingReceiversName() == null : this.getProfitSharingReceiversName().equals(other.getProfitSharingReceiversName()))
&& (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
@ -211,6 +239,8 @@ public class HighMerchantTripartitePlatform implements Serializable {
result = prime * result + ((getPlatformMerNumber() == null) ? 0 : getPlatformMerNumber().hashCode());
result = prime * result + ((getProfitSharingStatus() == null) ? 0 : getProfitSharingStatus().hashCode());
result = prime * result + ((getProfitSharingRatio() == null) ? 0 : getProfitSharingRatio().hashCode());
result = prime * result + ((getProfitSharingReceiversNumber() == null) ? 0 : getProfitSharingReceiversNumber().hashCode());
result = prime * result + ((getProfitSharingReceiversName() == null) ? 0 : getProfitSharingReceiversName().hashCode());
result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
@ -233,6 +263,8 @@ public class HighMerchantTripartitePlatform implements Serializable {
sb.append(", platformMerNumber=").append(platformMerNumber);
sb.append(", profitSharingStatus=").append(profitSharingStatus);
sb.append(", profitSharingRatio=").append(profitSharingRatio);
sb.append(", profitSharingReceiversNumber=").append(profitSharingReceiversNumber);
sb.append(", profitSharingReceiversName=").append(profitSharingReceiversName);
sb.append(", status=").append(status);
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);

140
hai-service/src/main/java/com/hai/entity/HighMerchantTripartitePlatformExample.java
Unescape View File

@ -566,6 +566,146 @@ public class HighMerchantTripartitePlatformExample {
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberIsNull() {
addCriterion("profit_sharing_receivers_number is null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberIsNotNull() {
addCriterion("profit_sharing_receivers_number is not null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberEqualTo(String value) {
addCriterion("profit_sharing_receivers_number =", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotEqualTo(String value) {
addCriterion("profit_sharing_receivers_number <>", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberGreaterThan(String value) {
addCriterion("profit_sharing_receivers_number >", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberGreaterThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_number >=", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberLessThan(String value) {
addCriterion("profit_sharing_receivers_number <", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberLessThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_number <=", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberLike(String value) {
addCriterion("profit_sharing_receivers_number like", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotLike(String value) {
addCriterion("profit_sharing_receivers_number not like", value, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberIn(List<String> values) {
addCriterion("profit_sharing_receivers_number in", values, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotIn(List<String> values) {
addCriterion("profit_sharing_receivers_number not in", values, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_number between", value1, value2, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNumberNotBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_number not between", value1, value2, "profitSharingReceiversNumber");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameIsNull() {
addCriterion("profit_sharing_receivers_name is null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameIsNotNull() {
addCriterion("profit_sharing_receivers_name is not null");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameEqualTo(String value) {
addCriterion("profit_sharing_receivers_name =", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotEqualTo(String value) {
addCriterion("profit_sharing_receivers_name <>", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameGreaterThan(String value) {
addCriterion("profit_sharing_receivers_name >", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameGreaterThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_name >=", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameLessThan(String value) {
addCriterion("profit_sharing_receivers_name <", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameLessThanOrEqualTo(String value) {
addCriterion("profit_sharing_receivers_name <=", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameLike(String value) {
addCriterion("profit_sharing_receivers_name like", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotLike(String value) {
addCriterion("profit_sharing_receivers_name not like", value, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameIn(List<String> values) {
addCriterion("profit_sharing_receivers_name in", values, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotIn(List<String> values) {
addCriterion("profit_sharing_receivers_name not in", values, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_name between", value1, value2, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andProfitSharingReceiversNameNotBetween(String value1, String value2) {
addCriterion("profit_sharing_receivers_name not between", value1, value2, "profitSharingReceiversName");
return (Criteria) this;
}
public Criteria andStatusIsNull() {
addCriterion("`status` is null");
return (Criteria) this;

Write Preview
Loading…
Cancel
Save