Skip to content

O
order-group
Commit 33a2c878 by dingkai
Options

Merge branch 'feature/1.9.20-蜜雪中台-dingkai' 

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
parents 986eb351 b59627a0
Showing with 44 additions and 13 deletions
assortment-ordercenter-sdk/pom.xml
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.3.5.RELEASE</version> <version>1.3.6.RELEASE</version>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
assortment-ordercenter-sdk/readme.md
...@@ -9,7 +9,8 @@ ...@@ -9,7 +9,8 @@
| 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId） | 胡超 | 20200113 | | 1.1.3.RELEASE| 1.9.10需求打包release版本（thirdCateId） | 胡超 | 20200113 |
| 1.1.4.RELEASE| 农工商submit接口 | 侯书虎 | 2020-01-13 | | 1.1.4.RELEASE| 农工商submit接口 | 侯书虎 | 2020-01-13 |
| 1.1.5.RELEASE| 农工商submit接口(del thirdCateId) | 胡超 | 2020-01-13 | | 1.1.5.RELEASE| 农工商submit接口(del thirdCateId) | 胡超 | 2020-01-13 |
| 1.1.6-SNAPSHOT| 1.9.11商品组 | 胡超 | 2020-02-05 | | 1.1.6.SNAPSHOT| 1.9.11商品组 | 胡超 | 2020-02-05 |
| 1.1.7.SNAPSHOT| 核销流程更改 | 侯书虎 | 2020-02-10 |
| 1.1.7.RELEASE| 1.9.11商品组 | 胡超 | 2020-02-13 | | 1.1.7.RELEASE| 1.9.11商品组 | 胡超 | 2020-02-13 |
| 1.1.9.RELEASE| pos渠道 | 丁凯 | 2020-02-22 | | 1.1.9.RELEASE| pos渠道 | 丁凯 | 2020-02-22 |
| 1.2.0.RELEASE| 开放平台创建订单 | 姜海波 | 2020-02-24 | | 1.2.0.RELEASE| 开放平台创建订单 | 姜海波 | 2020-02-24 |
...@@ -29,4 +30,5 @@ ...@@ -29,4 +30,5 @@
| 1.3.2.RELEASE | ext_info 增加stapleFood主食设置 | 李小二 | 2020-04-20 | | 1.3.2.RELEASE | ext_info 增加stapleFood主食设置 | 李小二 | 2020-04-20 |
| 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 | | 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
| 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 | | 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
| 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 | | 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
\ No newline at end of file | 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
\ No newline at end of file
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
...@@ -138,6 +138,7 @@ public class OrderSdkAdapter { ...@@ -138,6 +138,7 @@ public class OrderSdkAdapter {
//用户在界面上看到的支付金额 //用户在界面上看到的支付金额
request.setSettlementAmount(requestVO.getAmount()); request.setSettlementAmount(requestVO.getAmount());
//实际支付现金金额，扣除支付自生优惠，单位分 //实际支付现金金额，扣除支付自生优惠，单位分
request.setActualPayAmount(requestVO.getAmount());
if(requestVO.getOrderClient() != null){ if(requestVO.getOrderClient() != null){
request.setOrderClient(requestVO.getOrderClient().getIndex()); request.setOrderClient(requestVO.getOrderClient().getIndex());
}else { }else {
...@@ -431,6 +432,9 @@ public class OrderSdkAdapter { ...@@ -431,6 +432,9 @@ public class OrderSdkAdapter {
if ("saasmall".equals(queryOrdersRequest.getSource()[i])) { if ("saasmall".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.SAASMALL.getIndex()); orderClients.add(OrderClientType.SAASMALL.getIndex());
} }
if ("app".equals(queryOrdersRequest.getSource()[i])) {
orderClients.add(OrderClientType.APP.getIndex());
}
} }
orderClients.add(OrderClientType.ALIPAY.getIndex()); orderClients.add(OrderClientType.ALIPAY.getIndex());
orderConditionsReq.setOrderClients(orderClients); orderConditionsReq.setOrderClients(orderClients);
...@@ -1231,6 +1235,9 @@ public class OrderSdkAdapter { ...@@ -1231,6 +1235,9 @@ public class OrderSdkAdapter {
case "saasmall": case "saasmall":
orderClientType = 23; orderClientType = 23;
break; break;
case "app":
orderClientType = 12;
break;
default: default:
orderClientType = OrderClientType.SAAS.getIndex(); orderClientType = OrderClientType.SAAS.getIndex();
break; break;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/enums/OrderSourceType.java
...@@ -37,6 +37,8 @@ public enum OrderSourceType { ...@@ -37,6 +37,8 @@ public enum OrderSourceType {
ALIPAY("alipay", "支付宝"), ALIPAY("alipay", "支付宝"),
SAASMALL("saasmall", "微商城"), SAASMALL("saasmall", "微商城"),
APP("app", "APP"),
; ;
private String code; private String code;
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/PaymentRequest.java
...@@ -14,4 +14,6 @@ public class PaymentRequest extends BaseConfig { ...@@ -14,4 +14,6 @@ public class PaymentRequest extends BaseConfig {
private String reverseNotifyiDcUrl; private String reverseNotifyiDcUrl;
private String payCode;
} }
order-application-service/pom.xml
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>1.3.5.RELEASE</version> <version>1.3.6.RELEASE</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.freemud.application.service.sdk</groupId> <groupId>com.freemud.application.service.sdk</groupId>
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -796,6 +796,8 @@ public class OrderAdapter { ...@@ -796,6 +796,8 @@ public class OrderAdapter {
queryOrdersDto.setSource(new String[]{"meals"}); queryOrdersDto.setSource(new String[]{"meals"});
} else if(OrderChannelType.SAASMALL.getCode().equals(channelType)) { } else if(OrderChannelType.SAASMALL.getCode().equals(channelType)) {
queryOrdersDto.setSource(new String[]{"saasmall"}); queryOrdersDto.setSource(new String[]{"saasmall"});
} else if(OrderChannelType.APP.getCode().equals(channelType)){
queryOrdersDto.setSource(new String[]{"app"});
} else { } else {
queryOrdersDto.setSource(new String[]{"saas"}); queryOrdersDto.setSource(new String[]{"saas"});
} }
...@@ -2245,6 +2247,7 @@ public class OrderAdapter { ...@@ -2245,6 +2247,7 @@ public class OrderAdapter {
}); });
} }
orderPayDto.setProducts(productBeans); orderPayDto.setProducts(productBeans);
//orderPayDto.setPayCode(paymentRequest.getPayCode());
return orderPayDto; return orderPayDto;
} }
...@@ -2742,7 +2745,7 @@ public class OrderAdapter { ...@@ -2742,7 +2745,7 @@ public class OrderAdapter {
public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId, String wxAppId, String openId, public CreatePrepayRequestDto convertToCreatePrepayRequestDto(String partnerId, String wxAppId, String openId,
String faceCode, String cardCode, QueryOrdersResponse.DataBean.OrderBean fatherOrderBean, String faceCode, String cardCode, String payCode, QueryOrdersResponse.DataBean.OrderBean fatherOrderBean,
QueryOrdersResponse.DataBean.OrderBean productOrderBean, long totalAmount, int cardAmount, OrderExtInfoDTO orderExtInfoDTO){ QueryOrdersResponse.DataBean.OrderBean productOrderBean, long totalAmount, int cardAmount, OrderExtInfoDTO orderExtInfoDTO){
CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto(); CreatePrepayRequestDto requestDto = new CreatePrepayRequestDto();
requestDto.setPartnerId(partnerId); requestDto.setPartnerId(partnerId);
...@@ -2750,6 +2753,7 @@ public class OrderAdapter { ...@@ -2750,6 +2753,7 @@ public class OrderAdapter {
requestDto.setOpenId(openId); requestDto.setOpenId(openId);
requestDto.setFaceCode(faceCode); requestDto.setFaceCode(faceCode);
requestDto.setCardCode(cardCode); requestDto.setCardCode(cardCode);
requestDto.setPayCode(payCode);
requestDto.setFatherOrderBean(fatherOrderBean); requestDto.setFatherOrderBean(fatherOrderBean);
requestDto.setProductOrderBean(productOrderBean); requestDto.setProductOrderBean(productOrderBean);
requestDto.setTotalAmount(totalAmount); requestDto.setTotalAmount(totalAmount);
...@@ -2761,7 +2765,8 @@ public class OrderAdapter { ...@@ -2761,7 +2765,8 @@ public class OrderAdapter {
public CreatePrepayRequestDto convertToCreatePrepayRequestDto(AssortmentCustomerInfoVo userLoginInfoDto,CreateOrderVo createOrderVo, public CreatePrepayRequestDto convertToCreatePrepayRequestDto(AssortmentCustomerInfoVo userLoginInfoDto,CreateOrderVo createOrderVo,
CreateOrderOperateDto createOrderOperateDto, OrderExtInfoDTO orderExtInfoDTO){ CreateOrderOperateDto createOrderOperateDto, OrderExtInfoDTO orderExtInfoDTO){
return this.convertToCreatePrepayRequestDto(createOrderVo.getPartnerId(), userLoginInfoDto.getWxAppId(), userLoginInfoDto.getOpenId(), return this.convertToCreatePrepayRequestDto(createOrderVo.getPartnerId(), userLoginInfoDto.getWxAppId(), userLoginInfoDto.getOpenId(),
createOrderVo.getFaceCode(), createOrderVo.getCardCode(), createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(), createOrderVo.getFaceCode(), createOrderVo.getCardCode(), null,
createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(),
createOrderOperateDto.getTotalAmount() == null ? 0 : createOrderOperateDto.getTotalAmount(), createOrderOperateDto.getTotalAmount() == null ? 0 : createOrderOperateDto.getTotalAmount(),
createOrderOperateDto.getCardAmount() == null ? 0 : createOrderOperateDto.getCardAmount(), orderExtInfoDTO); createOrderOperateDto.getCardAmount() == null ? 0 : createOrderOperateDto.getCardAmount(), orderExtInfoDTO);
} }
......
order-application-service/src/main/java/cn/freemud/entities/dto/order/CreatePrepayRequestDto.java
...@@ -11,6 +11,7 @@ public class CreatePrepayRequestDto { ...@@ -11,6 +11,7 @@ public class CreatePrepayRequestDto {
private String openId; private String openId;
private String faceCode; private String faceCode;
private String cardCode; private String cardCode;
private String payCode;
private QueryOrdersResponse.DataBean.OrderBean fatherOrderBean; private QueryOrdersResponse.DataBean.OrderBean fatherOrderBean;
private QueryOrdersResponse.DataBean.OrderBean productOrderBean; private QueryOrdersResponse.DataBean.OrderBean productOrderBean;
private long totalAmount; private long totalAmount;
......
order-application-service/src/main/java/cn/freemud/entities/vo/CreatePrepayVo.java
...@@ -39,4 +39,7 @@ public class CreatePrepayVo { ...@@ -39,4 +39,7 @@ public class CreatePrepayVo {
@ApiModelProperty(value = "微信openId") @ApiModelProperty(value = "微信openId")
private String openId; private String openId;
@ApiModelProperty(value = "支付渠道编号(参考支付组payment_platform)")
private String payCode;
} }
order-application-service/src/main/java/cn/freemud/enums/OrderChannelType.java
...@@ -20,7 +20,9 @@ public enum OrderChannelType { ...@@ -20,7 +20,9 @@ public enum OrderChannelType {
IWC("iwc","i围餐"), IWC("iwc","i围餐"),
SAASMALL("saasmall", "微商城"); SAASMALL("saasmall", "微商城"),
APP("app", "APP");
private String code; private String code;
......
order-application-service/src/main/java/cn/freemud/service/impl/AppOrderServiceImpl.java
...@@ -92,10 +92,12 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -92,10 +92,12 @@ public class AppOrderServiceImpl implements AppOrderService {
// 关闭历史预支付订单 // 关闭历史预支付订单
this.closeHistoryPrePay(productOrderBean); this.closeHistoryPrePay(productOrderBean);
OrderExtInfoDTO extInfo = JSONObject.parseObject(productOrderBean.getExtInfo(), OrderExtInfoDTO.class); OrderExtInfoDTO extInfo = JSONObject.parseObject(productOrderBean.getExtInfo(), OrderExtInfoDTO.class);
extInfo.setAppid(createPrepayVo.getPayAppId());
extInfo.setOpenid(createPrepayVo.getOpenId());
String faceCode = ""; String faceCode = "";
String cardCode = ""; String cardCode = "";
CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(createPrepayVo.getPartnerId(), createPrepayVo.getPayAppId(), createPrepayVo.getOpenId(), faceCode, CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(createPrepayVo.getPartnerId(), createPrepayVo.getPayAppId(), createPrepayVo.getOpenId(), faceCode,
cardCode, createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(), createOrderOperateDto.getTotalAmount(), cardCode, createPrepayVo.getPayCode(), createOrderOperateDto.getFatherOrderBean(), createOrderOperateDto.getProductOrderBean(), createOrderOperateDto.getTotalAmount(),
createOrderOperateDto.getCardAmount(), extInfo); createOrderOperateDto.getCardAmount(), extInfo);
return orderservice.createPrepayOrder(createPrepayRequestDto); return orderservice.createPrepayOrder(createPrepayRequestDto);
} }
...@@ -105,7 +107,7 @@ public class AppOrderServiceImpl implements AppOrderService { ...@@ -105,7 +107,7 @@ public class AppOrderServiceImpl implements AppOrderService {
throw new ServiceException(ResponseResult.ORDER_HAS_PAID); throw new ServiceException(ResponseResult.ORDER_HAS_PAID);
} }
OrderExtInfoDTO extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDTO.class); OrderExtInfoDTO extInfo = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDTO.class);
if(extInfo == null || StringUtils.isBlank(extInfo.getSessionId()) || extInfo.getSessionId().equals(createPrepayVo.getSessionId())) { if(extInfo == null || StringUtils.isBlank(extInfo.getSessionId()) || !extInfo.getSessionId().equals(createPrepayVo.getSessionId())) {
throw new ServiceException(ResponseResult.ORDER_OWNER_ERROR); throw new ServiceException(ResponseResult.ORDER_OWNER_ERROR);
} }
} }
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -1780,7 +1780,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1780,7 +1780,7 @@ public class OrderServiceImpl implements Orderservice {
CreateOrderResponseVo createOrderResponse; CreateOrderResponseVo createOrderResponse;
OrderPayResponse orderPayResponse = null; OrderPayResponse orderPayResponse = null;
PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId()); PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode());
long totalAmount = createPrepayRequestDto.getTotalAmount(); long totalAmount = createPrepayRequestDto.getTotalAmount();
String cardCode = createPrepayRequestDto.getCardCode(); String cardCode = createPrepayRequestDto.getCardCode();
if (totalAmount < 0) { if (totalAmount < 0) {
...@@ -1888,6 +1888,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1888,6 +1888,7 @@ public class OrderServiceImpl implements Orderservice {
UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount); UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount);
com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo); com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) { if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
return null; return null;
} }
putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid()); putDelMq(request.getPartnerId(), request.getStoreId(), responseBase.getData().getFmId(), orderBean.getOid());
...@@ -1948,7 +1949,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1948,7 +1949,7 @@ public class OrderServiceImpl implements Orderservice {
return orderPayResponse; return orderPayResponse;
} }
private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId,String appId) { private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId,String appId, String payCode) {
// String wxAppId = userLoginInfoDto.getWxAppId(); // String wxAppId = userLoginInfoDto.getWxAppId();
//设置支付信息 //设置支付信息
PaymentRequest paymentRequest = new PaymentRequest(); PaymentRequest paymentRequest = new PaymentRequest();
...@@ -1961,6 +1962,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1961,6 +1962,7 @@ public class OrderServiceImpl implements Orderservice {
} }
paymentRequest.setPrincipalName(principalName); paymentRequest.setPrincipalName(principalName);
paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl); paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
paymentRequest.setPayCode(payCode);
return paymentRequest; return paymentRequest;
} }
...@@ -2064,6 +2066,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2064,6 +2066,7 @@ public class OrderServiceImpl implements Orderservice {
// orderExtInfo = orderAdapter.getOrderExtInfo(orderPayResponse, orderExtInfo); // orderExtInfo = orderAdapter.getOrderExtInfo(orderPayResponse, orderExtInfo);
orderExtInfo.setOpenid(orderPayResponse.getOpenId()); orderExtInfo.setOpenid(orderPayResponse.getOpenId());
orderExtInfo.setFmId(orderPayResponse.getFmId()); orderExtInfo.setFmId(orderPayResponse.getFmId());
orderExtInfo.setAppid(orderPayResponse.getWxAppid());
String prepayId = ""; String prepayId = "";
OrderPayResponse.PayOrderBean payOrder = orderPayResponse.getPayOrder(); OrderPayResponse.PayOrderBean payOrder = orderPayResponse.getPayOrder();
// StringUtils 依赖修改 // StringUtils 依赖修改
...@@ -2331,7 +2334,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2331,7 +2334,7 @@ public class OrderServiceImpl implements Orderservice {
//<!---创建订单公共方法执行逻辑---> //<!---创建订单公共方法执行逻辑--->
OrderPayResponse orderPayResponse = null; OrderPayResponse orderPayResponse = null;
String appId = userLoginInfoDto.getWxAppId(); String appId = userLoginInfoDto.getWxAppId();
PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto.getOpenId(), createOrderVo.getPartnerId(),appId); PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto.getOpenId(), createOrderVo.getPartnerId(),appId, null);
//支付金额异常 //支付金额异常
if (totalAmount < 0) { if (totalAmount < 0) {
throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR); throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
...@@ -2415,6 +2418,8 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2415,6 +2418,8 @@ public class OrderServiceImpl implements Orderservice {
channelType = OrderChannelType.IWC.getCode(); channelType = OrderChannelType.IWC.getCode();
} else if(OrderChannelType.SAASMALL.getCode().equals(queryOrderVo.getChannelType())) { } else if(OrderChannelType.SAASMALL.getCode().equals(queryOrderVo.getChannelType())) {
channelType = OrderChannelType.SAASMALL.getCode(); channelType = OrderChannelType.SAASMALL.getCode();
} else if(UserLoginChannelEnum.APP.getCode().equals(userLoginInfoDto.getChannel())) {
channelType = OrderChannelType.APP.getCode();
} }
return channelType; return channelType;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment