Browse Source

Merge branch 'release'

release
张彭杰 11 months ago
parent
commit
7294c2fdff
22 changed files with 555 additions and 10 deletions
  1. 4
      dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderBelongingEnum.java
  2. 6
      dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductMainCategoryEnum.java
  3. 8
      dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java
  4. 4
      dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductTypeEnum.java
  5. 2
      dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/order/entity/Order.java
  6. 5
      dating-agency-mall-server/pom.xml
  7. 18
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/request/BankCardVerifyDto.java
  8. 8
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/request/UserCreateBankCardDto.java
  9. 12
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/response/BankCardVerifyVo.java
  10. 10
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java
  11. 35
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMatchmakingCornerOrderDto.java
  12. 9
      dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java
  13. 5
      dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java
  14. 6
      dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/bankcard/BankCardApplicationService.java
  15. 15
      dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java
  16. 1
      dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqExchange.java
  17. 3
      dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java
  18. 72
      dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/utils/BankCardUtil.java
  19. 311
      dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/utils/HttpUtils.java
  20. 2
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java
  21. 6
      dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java
  22. 23
      dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml

4
dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/order/constant/OrderBelongingEnum.java

@ -12,7 +12,9 @@ public enum OrderBelongingEnum {
CUSTOMER(1, "客户"),
MATCHMAKER(2, "红娘");
MATCHMAKER(2, "红娘"),
MATCHMAKING_CORNER(3, "相亲角");
@EnumValue
@JsonValue

6
dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductMainCategoryEnum.java

@ -17,13 +17,15 @@ public enum ProductMainCategoryEnum {
DATE_EDITING(2, "资料编辑"),
UNLOCKING_INFORMATION(3, "解锁信息"),
OFFLINE_SERVICES(4, "线下服务"),
CHAT_CARD(5,"聊天卡"),
CHAT_CARD(5, "聊天卡"),
VIP(6, "会员"),
MARRIAGE_BOUNTY(7, "悬赏招亲"),
SITE_ACTIVITY(8, "线下活动"),
MATCHMAKER(888,"红娘合伙人");
MATCHMAKER(888, "红娘合伙人"),
MATCHMAKING_CORNER(999, "相亲角");
@EnumValue
@JsonValue

8
dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductSubCategoryEnum.java

@ -46,7 +46,13 @@ public enum ProductSubCategoryEnum {
MATCHMAKER_ONLINE_FEE(88802, "线上红娘"),
MATCHMAKER_TRAINEE_FEE(88803, "实习红娘");
MATCHMAKER_TRAINEE_FEE(88803, "实习红娘"),
MATCHMAKING_CORNER_STANDARD_FEE(99901, "相亲角标准版"),
MATCHMAKING_CORNER_LUXURY_FEE(99902, "相亲角豪华版"),
MATCHMAKING_CORNER_HONOURABLE_FEE(99903, "相亲角尊贵版");
@EnumValue
@JsonValue

4
dating-agency-mall-constant/src/main/java/com/qniao/dam/domian/aggregate/product/constant/ProductTypeEnum.java

@ -14,7 +14,9 @@ public enum ProductTypeEnum {
CUSTOMER_VIRTUAL(2, "客户虚拟物品"),
MATCHMAKER_VIRTUAL(3, "红娘虚拟物品");
MATCHMAKER_VIRTUAL(3, "红娘虚拟物品"),
MATCHMAKING_CORNER_VIRTUAL(4, "相亲角虚拟物品");
@EnumValue
@JsonValue

2
dating-agency-mall-entity/src/main/java/com/qniao/dam/domain/aggregate/order/entity/Order.java

@ -76,6 +76,8 @@ public class Order extends Entity<Order> {
OrderBelongingEnum orderBelonging = OrderBelongingEnum.CUSTOMER;
if (ProductTypeEnum.MATCHMAKER_VIRTUAL.equals(productType)) {
orderBelonging = OrderBelongingEnum.MATCHMAKER;
}else if (ProductTypeEnum.MATCHMAKING_CORNER_VIRTUAL.equals(productType)) {
orderBelonging = OrderBelongingEnum.MATCHMAKING_CORNER;
}
return orderBelonging;
}

5
dating-agency-mall-server/pom.xml

@ -86,6 +86,11 @@
<artifactId>dating-agency-service-event</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qniao</groupId>
<artifactId>dating-agency-uec-event</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>com.qniao</groupId>
<artifactId>dating-agency-service-entity</artifactId>

18
dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/request/BankCardVerifyDto.java

@ -0,0 +1,18 @@
package com.qniao.dam.api.command.bankcard.user.request;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
public class BankCardVerifyDto {
@ApiModelProperty("持卡人姓名")
private String ownerName;
@ApiModelProperty("卡号")
private String cardNum;
}

8
dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/request/UserCreateBankCardDto.java

@ -14,22 +14,22 @@ public class UserCreateBankCardDto implements Trans2DomainAssembler<BankCard> {
@ApiModelProperty("持卡人姓名")
@NotNull(message = "持卡人姓名不能为空")
@Size(max = 32, message = "持卡人姓名不超过32个字符")
@Size(max = 32,min = 1, message = "持卡人姓名不超过32个字符")
private String ownerName;
@ApiModelProperty("银行")
@NotNull(message = "银行不能为空")
@Size(max = 32, message = "银行不超过32个字符")
@Size(max = 32,min = 1, message = "银行不超过32个字符")
private String bankName;
@ApiModelProperty("卡号")
@NotNull(message = "卡号不能为空")
@Size(max = 32, message = "卡号不超过32个字符")
@Size(max = 32,min = 1, message = "卡号不超过32个字符")
private String cardNum;
@ApiModelProperty("开户支行")
@NotNull(message = "开户支行不能为空")
@Size(max = 100, message = "开户支行不超过100个字符")
@Size(max = 100,min = 1, message = "开户支行不超过100个字符")
private String openingBank;
@Override

12
dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/bankcard/user/response/BankCardVerifyVo.java

@ -0,0 +1,12 @@
package com.qniao.dam.api.command.bankcard.user.response;
import lombok.Data;
@Data
public class BankCardVerifyVo {
private Boolean status;
private String msg;
}

10
dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/OrderUserCommandController.java

@ -95,4 +95,14 @@ public class OrderUserCommandController {
public void userCompleteOrder(@RequestBody @Valid UserCompleteOrderDto dto) {
orderApplicationService.complete(dto.getId());
}
@ApiOperation("用户提交相亲角订单")
@PostMapping("submit/matchmaking_corner")
public UserSubmitOrderVo userSubmitMatchmakingCornerOrder(@RequestBody @Valid UserSubmitMatchmakingCornerOrderDto dto,
@RequestParam("userId") Long userId) {
Order order = dto.trans2Domain();
order.setUserId(userId);
return orderApplicationService.submitMatchmakingCornerOrder(order);
}
}

35
dating-agency-mall-server/src/main/java/com/qniao/dam/api/command/order/user/request/UserSubmitMatchmakingCornerOrderDto.java

@ -0,0 +1,35 @@
package com.qniao.dam.api.command.order.user.request;
import com.qniao.dam.domain.aggregate.order.entity.Order;
import com.qniao.dam.domain.aggregate.order.entity.OrderItem;
import com.qniao.domain.Trans2DomainAssembler;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import javax.validation.constraints.NotNull;
import java.util.ArrayList;
import java.util.List;
@Data
public class UserSubmitMatchmakingCornerOrderDto implements Trans2DomainAssembler<Order> {
@ApiModelProperty("产品规格标识")
@NotNull(message = "产品规格标识不能为空")
private Long productSpecId;
@ApiModelProperty("用户名称")
private String userName;
@Override
public Order trans2Domain() {
Order order = new Order();
order.setOrderBelongName(userName);
List<OrderItem> orderItemList = new ArrayList<>();
OrderItem orderItem = new OrderItem();
orderItem.setProductSpecId(productSpecId);
orderItem.setQuantity(1);
orderItemList.add(orderItem);
order.setOrderItemList(orderItemList);
return order;
}
}

9
dating-agency-mall-server/src/main/java/com/qniao/dam/api/query/product/user/ProductUserQueryController.java

@ -71,6 +71,13 @@ public class ProductUserQueryController {
return PageUtil.convert(productQueryService.pageProductByMatchmaker(pageUtil, queryParam), UserPageProductByMatchmakerVo.class);
}
@GetMapping("page/product/by/matchmaking-corner")
@ApiOperation("相亲角获取商品分页列表")
public QnPage<UserPageProductByMatchmakerVo> userPageProductByMatchmakingCorner(PageUtil pageUtil,
UserPageProductByMatchmakerQueryParam queryParam) {
return PageUtil.convert(productQueryService.pageProductByMatchmakingCorner(pageUtil, queryParam), UserPageProductByMatchmakerVo.class);
}
@GetMapping("get/product/by/customer/list")
@ApiOperation("客户获取商品列表")
public List<UserPageProductByCustomerGroupVo> getPageProductByCustomer() {
@ -79,7 +86,7 @@ public class ProductUserQueryController {
@GetMapping("get/product/by/customer/details")
@ApiOperation("客户获取商品详情")
public List<UserPageProductByCustomerGroupVo> getPageProductByCustomer(@RequestParam(value = "id",required = true) Long id,@RequestParam(value = "userId",required = false) Long userId) {
public List<UserPageProductByCustomerGroupVo> getPageProductByCustomer(@RequestParam(value = "id", required = true) Long id, @RequestParam(value = "userId", required = false) Long userId) {
return productQueryService.getPageProductByCustomer(id);
}

5
dating-agency-mall-server/src/main/java/com/qniao/dam/application/handler/order/OrderEventHandler.java

@ -40,6 +40,7 @@ import com.qniao.das.domian.aggregate.marriageinformation.MarriageInformation;
import com.qniao.das.domian.aggregate.siteactivity.SiteActivity;
import com.qniao.dau.application.UecServerApplicationService;
import com.qniao.dau.application.request.PaidMatchmakerFeeBySdkDto;
import com.qniao.dau.domian.aggregate.matchmakingcorner.event.MatchmakingCornerPaidMQ;
import com.qniao.domain.BaseApplicationService;
import com.qniao.domain.BaseDomainEvent;
import lombok.extern.slf4j.Slf4j;
@ -126,6 +127,10 @@ public class OrderEventHandler extends BaseApplicationService {
}
PaidMatchmakerFeeBySdkDto dto = new PaidMatchmakerFeeBySdkDto(order.getUserId(), orderItem.getSubCategory(), order.getOriginalAmount(), validityPeriodDays, order.getId(), matchmakerOrderType);
uecServerApplicationService.userPaidMatchmakerFee(dto);
} else if (OrderBelongingEnum.MATCHMAKING_CORNER.equals(order.getOrderBelonging())) {
OrderItem orderItem = order.getOrderItemList().get(0);
MatchmakingCornerPaidMQ mq = new MatchmakingCornerPaidMQ(order.getUserId(), orderItem.getSubCategory());
amqpTemplate.convertAndSend(MqExchange.MATCHMAKING_CORNER_PAID, null, mq);
}
//悬赏招亲
if (OrderTypeEnum.MARRIAGE_BOUNTY.equals(order.getOrderType())) {

6
dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/bankcard/BankCardApplicationService.java

@ -1,7 +1,9 @@
package com.qniao.dam.application.service.bankcard;
import com.qniao.dam.api.command.bankcard.user.request.BankCardVerifyDto;
import com.qniao.dam.domain.aggregate.bankcard.BankCardAggregate;
import com.qniao.dam.domain.aggregate.bankcard.entity.BankCard;
import com.qniao.dam.infrastructure.utils.BankCardUtil;
import com.qniao.dam.query.bankcard.BankCardQueryService;
import com.qniao.framework.exception.BizException;
import org.springframework.stereotype.Service;
@ -22,6 +24,10 @@ public class BankCardApplicationService {
if (Objects.nonNull(existBankCard)) {
throw new BizException("银行卡已存在");
} else {
//二要素校验
BankCardVerifyDto dto = new BankCardVerifyDto(bankCard.getOwnerName(), bankCard.getCardNum());
BankCardUtil.getBankCardVerify(dto);
bankCardAggregate.create(bankCard);
}
}

15
dating-agency-mall-server/src/main/java/com/qniao/dam/application/service/order/OrderApplicationService.java

@ -579,4 +579,19 @@ public class OrderApplicationService extends BaseApplicationService {
BaseDomainEvent orderCompletedEvent = orderAggregate.complete(order);
this.sendEvent(orderCompletedEvent);
}
public UserSubmitOrderVo submitMatchmakingCornerOrder(Order order) {
//1. 填充订单信息 + 同类型权益不同规格限制购买和提醒
fillOrderInfo(order);
//2. 结束历史订单
cancelHisOrder(order);
//2. 订单金额计算
countOrderAmount(order, false);
//3. 设置订单号
order.setOrderCode(snowFlakeUtil.getSnowflakeOrderCode());
//4. 组织付款单信息
PaymentOrder paymentOrder = makePaymentOrder(order);
submitOrderDomainService.handle(order, paymentOrder);
return new UserSubmitOrderVo(order.getId(), paymentOrder.getId(), false);
}
}

1
dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/constant/MqExchange.java

@ -24,4 +24,5 @@ public interface MqExchange {
String SITE_ACTIVITY_PARTICIPANT_SETTLED = "fanout.siteActivityParticipantSettled";
String MATCHMAKING_CORNER_PAID = "fanout.matchmakingCornerPaid";
}

3
dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/persistent/dao/view/ProductViewDao.java

@ -30,4 +30,7 @@ public interface ProductViewDao {
IPage<UserPageProductByMatchmakerVo> pageProductByMatchmaker(Page<Object> pageWithoutOrders,
@Param("queryParam") UserPageProductByMatchmakerQueryParam queryParam);
IPage<UserPageProductByMatchmakerVo> pageProductByMatchmakingCorner(Page<Object> pageWithoutOrders,
@Param("queryParam") UserPageProductByMatchmakerQueryParam queryParam);
}

72
dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/utils/BankCardUtil.java

@ -0,0 +1,72 @@
package com.qniao.dam.infrastructure.utils;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.qniao.dam.api.command.bankcard.user.request.BankCardVerifyDto;
import com.qniao.framework.exception.BizException;
import lombok.extern.slf4j.Slf4j;
import org.apache.http.HttpResponse;
import org.apache.http.util.EntityUtils;
import java.util.HashMap;
import java.util.Map;
@Slf4j
public class BankCardUtil {
private static final String authorization = "APPCODE 6fd14ec3939c483a89192c1fcc871c4b";
public static void getBankCardVerify(BankCardVerifyDto dto) {
String host = "https://kzbank3v1.market.alicloudapi.com";
String path = "/api/bankcard2/check";
String method = "POST";
Map<String, String> headers = new HashMap<String, String>();
//最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
headers.put("Authorization", authorization);
//根据API的要求定义相对应的Content-Type
headers.put("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8");
Map<String, String> querys = new HashMap<String, String>();
Map<String, String> bodys = new HashMap<String, String>();
bodys.put("bankcard", dto.getCardNum());
bodys.put("name", dto.getOwnerName());
try {
/**
* 重要提示如下:
* HttpUtils请从
* https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
* 下载
*
* 相应的依赖请参照
* https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
*/
HttpResponse response = HttpUtils.doPost(host, path, method, headers, querys, bodys);
JSONObject json = JSON.parseObject(EntityUtils.toString(response.getEntity()));
if (json.getString("success").equals("true")) {
// 成功
JSONObject dataJson = JSON.parseObject(json.getString("data"));
Integer result = dataJson.getInteger("result");
if (result != 0) {
String desc = dataJson.getString("desc");
log.error(desc);
throw new BizException(desc);
}
} else {
log.error("----------------银行卡二要素校验异常------------------");
String msg = json.getString("msg");
log.error(msg);
throw new BizException(msg);
}
} catch (BizException e) {
log.error("银行卡校验异常", e);
throw new BizException(e.getMessage());
} catch (Exception e) {
log.error("银行卡校验异常", e);
throw new BizException("银行卡校验异常");
}
}
}

311
dating-agency-mall-server/src/main/java/com/qniao/dam/infrastructure/utils/HttpUtils.java

@ -0,0 +1,311 @@
package com.qniao.dam.infrastructure.utils;
import org.apache.commons.lang.StringUtils;
import org.apache.http.HttpResponse;
import org.apache.http.NameValuePair;
import org.apache.http.client.HttpClient;
import org.apache.http.client.entity.UrlEncodedFormEntity;
import org.apache.http.client.methods.HttpDelete;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpPut;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.scheme.Scheme;
import org.apache.http.conn.scheme.SchemeRegistry;
import org.apache.http.conn.ssl.SSLSocketFactory;
import org.apache.http.entity.ByteArrayEntity;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.DefaultHttpClient;
import org.apache.http.message.BasicNameValuePair;
import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
import javax.net.ssl.X509TrustManager;
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.security.KeyManagementException;
import java.security.NoSuchAlgorithmException;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
public class HttpUtils {
/**
* get
*
* @param host
* @param path
* @param method
* @param headers
* @param querys
* @return
* @throws Exception
*/
public static HttpResponse doGet(String host, String path, String method,
Map<String, String> headers,
Map<String, String> querys)
throws Exception {
HttpClient httpClient = wrapClient(host);
HttpGet request = new HttpGet(buildUrl(host, path, querys));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
return httpClient.execute(request);
}
/**
* post form
*
* @param host
* @param path
* @param method
* @param headers
* @param querys
* @param bodys
* @return
* @throws Exception
*/
public static HttpResponse doPost(String host, String path, String method,
Map<String, String> headers,
Map<String, String> querys,
Map<String, String> bodys)
throws Exception {
HttpClient httpClient = wrapClient(host);
HttpPost request = new HttpPost(buildUrl(host, path, querys));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
if (bodys != null) {
List<NameValuePair> nameValuePairList = new ArrayList<NameValuePair>();
for (String key : bodys.keySet()) {
nameValuePairList.add(new BasicNameValuePair(key, bodys.get(key)));
}
UrlEncodedFormEntity formEntity = new UrlEncodedFormEntity(nameValuePairList, "utf-8");
formEntity.setContentType("application/x-www-form-urlencoded; charset=UTF-8");
request.setEntity(formEntity);
}
return httpClient.execute(request);
}
/**
* Post String
*
* @param host
* @param path
* @param method
* @param headers
* @param querys
* @param body
* @return
* @throws Exception
*/
public static HttpResponse doPost(String host, String path, String method,
Map<String, String> headers,
Map<String, String> querys,
String body)
throws Exception {
HttpClient httpClient = wrapClient(host);
HttpPost request = new HttpPost(buildUrl(host, path, querys));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
if (StringUtils.isNotBlank(body)) {
request.setEntity(new StringEntity(body, "utf-8"));
}
return httpClient.execute(request);
}
/**
* Post stream
*
* @param host
* @param path
* @param method
* @param headers
* @param querys
* @param body
* @return
* @throws Exception
*/
public static HttpResponse doPost(String host, String path, String method,
Map<String, String> headers,
Map<String, String> querys,
byte[] body)
throws Exception {
HttpClient httpClient = wrapClient(host);
HttpPost request = new HttpPost(buildUrl(host, path, querys));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
if (body != null) {
request.setEntity(new ByteArrayEntity(body));
}
return httpClient.execute(request);
}
/**
* Put String
* @param host
* @param path
* @param method
* @param headers
* @param querys
* @param body
* @return
* @throws Exception
*/
public static HttpResponse doPut(String host, String path, String method,
Map<String, String> headers,
Map<String, String> querys,
String body)
throws Exception {
HttpClient httpClient = wrapClient(host);
HttpPut request = new HttpPut(buildUrl(host, path, querys));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
if (StringUtils.isNotBlank(body)) {
request.setEntity(new StringEntity(body, "utf-8"));
}
return httpClient.execute(request);
}
/**
* Put stream
* @param host
* @param path
* @param method
* @param headers
* @param querys
* @param body
* @return
* @throws Exception
*/
public static HttpResponse doPut(String host, String path, String method,
Map<String, String> headers,
Map<String, String> querys,
byte[] body)
throws Exception {
HttpClient httpClient = wrapClient(host);
HttpPut request = new HttpPut(buildUrl(host, path, querys));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
if (body != null) {
request.setEntity(new ByteArrayEntity(body));
}
return httpClient.execute(request);
}
/**
* Delete
*
* @param host
* @param path
* @param method
* @param headers
* @param querys
* @return
* @throws Exception
*/
public static HttpResponse doDelete(String host, String path, String method,
Map<String, String> headers,
Map<String, String> querys)
throws Exception {
HttpClient httpClient = wrapClient(host);
HttpDelete request = new HttpDelete(buildUrl(host, path, querys));
for (Map.Entry<String, String> e : headers.entrySet()) {
request.addHeader(e.getKey(), e.getValue());
}
return httpClient.execute(request);
}
private static String buildUrl(String host, String path, Map<String, String> querys) throws UnsupportedEncodingException {
StringBuilder sbUrl = new StringBuilder();
sbUrl.append(host);
if (!StringUtils.isBlank(path)) {
sbUrl.append(path);
}
if (null != querys) {
StringBuilder sbQuery = new StringBuilder();
for (Map.Entry<String, String> query : querys.entrySet()) {
if (0 < sbQuery.length()) {
sbQuery.append("&");
}
if (StringUtils.isBlank(query.getKey()) && !StringUtils.isBlank(query.getValue())) {
sbQuery.append(query.getValue());
}
if (!StringUtils.isBlank(query.getKey())) {
sbQuery.append(query.getKey());
if (!StringUtils.isBlank(query.getValue())) {
sbQuery.append("=");
sbQuery.append(URLEncoder.encode(query.getValue(), "utf-8"));
}
}
}
if (0 < sbQuery.length()) {
sbUrl.append("?").append(sbQuery);
}
}
return sbUrl.toString();
}
private static HttpClient wrapClient(String host) {
HttpClient httpClient = new DefaultHttpClient();
if (host.startsWith("https://")) {
sslClient(httpClient);
}
return httpClient;
}
private static void sslClient(HttpClient httpClient) {
try {
SSLContext ctx = SSLContext.getInstance("TLS");
X509TrustManager tm = new X509TrustManager() {
public X509Certificate[] getAcceptedIssuers() {
return null;
}
public void checkClientTrusted(X509Certificate[] xcs, String str) {
}
public void checkServerTrusted(X509Certificate[] xcs, String str) {
}
};
ctx.init(null, new TrustManager[] { tm }, null);
SSLSocketFactory ssf = new SSLSocketFactory(ctx);
ssf.setHostnameVerifier(SSLSocketFactory.ALLOW_ALL_HOSTNAME_VERIFIER);
ClientConnectionManager ccm = httpClient.getConnectionManager();
SchemeRegistry registry = ccm.getSchemeRegistry();
registry.register(new Scheme("https", 443, ssf));
} catch (KeyManagementException ex) {
throw new RuntimeException(ex);
} catch (NoSuchAlgorithmException ex) {
throw new RuntimeException(ex);
}
}
}

2
dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/ProductQueryService.java

@ -41,4 +41,6 @@ public interface ProductQueryService {
Product querySiteActivityBy(Long siteActivityId, Integer genderCode);
Product queryById(Long id);
IPage<UserPageProductByMatchmakerVo> pageProductByMatchmakingCorner(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam);
}

6
dating-agency-mall-server/src/main/java/com/qniao/dam/query/product/impl/ProductQueryServiceImpl.java

@ -94,6 +94,11 @@ public class ProductQueryServiceImpl implements ProductQueryService {
return productViewDao.pageProductByMatchmaker(pageUtil.toPageWithoutOrders(), queryParam);
}
@Override
public IPage<UserPageProductByMatchmakerVo> pageProductByMatchmakingCorner(PageUtil pageUtil, UserPageProductByMatchmakerQueryParam queryParam) {
return productViewDao.pageProductByMatchmakingCorner(pageUtil.toPageWithoutOrders(), queryParam);
}
@Override
public Product queryBy(Long userId, Long miId, ProductSubCategoryEnum subCategory) {
return productDao.selectOne(new LambdaQueryWrapper<Product>()
@ -169,6 +174,7 @@ public class ProductQueryServiceImpl implements ProductQueryService {
return product;
}
@Override
public ProductSpecTerm getTermByName(List<ProductSpecTerm> productSpecTermList, ProductSpecTermNameEnum name) {
ProductSpecTerm productSpecTerm = null;

23
dating-agency-mall-server/src/main/resources/mapper/product/WalletAccountAssociateOrderRecordDao.xml

@ -156,5 +156,28 @@
</if>
order by dp.sub_category desc
</select>
<select id="pageProductByMatchmakingCorner"
resultType="com.qniao.dam.api.query.product.user.response.UserPageProductByMatchmakerVo">
select
dp.id as productId,
dps.id as productSpecId,
dp.main_category,
dp.sub_category,
dp.product_title,
dp.product_desc,
dp.detail_desc,
dps.unit_original_price,
dps.unit_selling_price,
dpst2.`value` as validityPeriodDays
from da_product as dp
LEFT JOIN da_product_spec as dps on dps.is_delete=0 and dps.product_id=dp.id
LEFT JOIN da_product_spec_term as dpst2 on dpst2.is_delete=0 and dpst2.product_spec_id =dps.id and dpst2.`name`=3
where dp.is_delete=0 and dp.`status`=1 and dp.product_type=4
<if test="queryParam.subCategory != null">
AND dp.sub_category = #{queryParam.subCategory}
</if>
order by dp.sub_category desc
</select>
</mapper>
Loading…
Cancel
Save