Skip to content

O
order-group
Commit 905d28c5 by 周晓航
Options

Merge branch 'KA-蜜雪订单C端支付展示-ID035981-20210826-zxh' into qa 

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
#	ordercenter-sdk/pom.xml
#	shopping-cart-application-service/pom.xml
#	shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
parents f7352843 18e74682
Showing with 44 additions and 12 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>2.2-RELEASE</version> <version>2.3.1-RELEASE</version>
<!-- 其他服务使用聚合订单sdk,版本号往上升级,无需提交版本号,记录好readme.md,后续看readme.md往上加版本 <!-- 其他服务使用聚合订单sdk,版本号往上升级,无需提交版本号,记录好readme.md,后续看readme.md往上加版本
服务内使用无需修改版本号， 如果修改，使用到聚合订单sdk都需要统一升级--> 服务内使用无需修改版本号， 如果修改，使用到聚合订单sdk都需要统一升级-->
<dependencies> <dependencies>
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<!-- <version>1.3.66.RELEASE</version>--> <!-- <version>1.3.67.RELEASE</version>-->
<!-- 版本号在最外层pom设置,其他服务使用聚合订单sdk,打开注释，版本号与基础订单sdk版本号保持一直,无需提交代码 --> <!-- 版本号在最外层pom设置,其他服务使用聚合订单sdk,打开注释，版本号与基础订单sdk版本号保持一直,无需提交代码 -->
</dependency> </dependency>
<dependency> <dependency>
......
assortment-ordercenter-sdk/readme.md
...@@ -162,4 +162,6 @@ ...@@ -162,4 +162,6 @@
| 3.1.0-SNAPSHOT | needInvoice/immediately字段的规范 | 王世昌 | 2021-07-14 | | 3.1.0-SNAPSHOT | needInvoice/immediately字段的规范 | 王世昌 | 2021-07-14 |
| 2.2-RELEASE | 版本升级，内部统一版本 | wuping | 2021-08-03| | 2.2-RELEASE | 版本升级，内部统一版本 | wuping | 2021-08-03|
| 2.2.1-RELEASE | 版本升级-开放平台支持商品券参数productId | 刘继明 | 2021-08-10| | 2.2.1-RELEASE | 版本升级-开放平台支持商品券参数productId | 刘继明 | 2021-08-10|
\ No newline at end of file | 2.3-RELEASE | 合并 爱马哥需求的代码 | 周晓航 | 2021-08-23|
| 2.3.1-RELEASE | 使用builder,手动添加构造器 | 周晓航 | 2021-08-23|
\ No newline at end of file
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/OrderExtended.java
...@@ -45,4 +45,16 @@ public class OrderExtended { ...@@ -45,4 +45,16 @@ public class OrderExtended {
* 预定单 蛋糕寄语(额外祝福语) * 预定单 蛋糕寄语(额外祝福语)
*/ */
private String sendWord; private String sendWord;
public OrderExtended() {
}
public OrderExtended(String orderClientGroup, String orderClientGroupCode, String storeNameEn, String spellGroupCode, String userPhone, String sendWord) {
this.orderClientGroup = orderClientGroup;
this.orderClientGroupCode = orderClientGroupCode;
this.storeNameEn = storeNameEn;
this.spellGroupCode = spellGroupCode;
this.userPhone = userPhone;
this.sendWord = sendWord;
}
} }
order-application-service/pom.xml
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.2-RELEASE</version> <version>2.3.1-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/service/impl/OrderCommonService.java
...@@ -121,6 +121,11 @@ public class OrderCommonService { ...@@ -121,6 +121,11 @@ public class OrderCommonService {
paymentRequest.setWxAppId(wxAppId); paymentRequest.setWxAppId(wxAppId);
AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId); AssortmentOpenPlatformWxapp wxApp = openPlatformWxappManager.findByPartnerIdAndWxappId(partnerId, wxAppId);
paymentRequest.setPrincipalName(wxApp.getPrincipalName()); paymentRequest.setPrincipalName(wxApp.getPrincipalName());
// fisherman 2227 测试商户号, 下个版本需要删除
if ("2080".equals(partnerId) || "2227".equals(partnerId)) {
//【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
paymentRequest.setPrincipalName("蜜雪冰城"+orderBean.getShopId()+"店");
}
paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl); paymentRequest.setReverseNotifyiDcUrl(reverseNotifyiDcUrl);
//修改订单信息 //修改订单信息
OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class) == null ? new OrderExtInfoDto() : JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class); OrderExtInfoDto orderExtInfoDto = JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class) == null ? new OrderExtInfoDto() : JSONObject.parseObject(orderBean.getExtInfo(), OrderExtInfoDto.class);
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -578,7 +578,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -578,7 +578,7 @@ public class OrderServiceImpl implements Orderservice {
newShoppingCartClearDto.setOperationType(1); newShoppingCartClearDto.setOperationType(1);
// fisherman 清楚 爱马哥蛋糕预定 类型购物车 bizType = 7 // fisherman 清楚 爱马哥蛋糕预定 类型购物车 bizType = 7
newShoppingCartClearDto.setBizType(orderBean.getBizType()); newShoppingCartClearDto.setBizType(orderBean.getBizType());
shoppingCartClient.clearShoppingCart(newShoppingCartClearDto); //shoppingCartClient.clearShoppingCart(newShoppingCartClearDto);
/** /**
主要 根据 ShoppingCartNewServiceImpl 次要 ShoppingCartMallServiceImpl 主要 根据 ShoppingCartNewServiceImpl 次要 ShoppingCartMallServiceImpl
...@@ -2632,7 +2632,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2632,7 +2632,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(), createPrepayRequestDto.getPayCode()); PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(createPrepayRequestDto.getOpenId(), createPrepayRequestDto.getPartnerId(), createPrepayRequestDto.getWxAppId(), createPrepayRequestDto.getPayCode(), createPrepayRequestDto.getFatherOrderBean().getShopId());
long totalAmount = createPrepayRequestDto.getTotalAmount(); long totalAmount = createPrepayRequestDto.getTotalAmount();
String cardCode = createPrepayRequestDto.getCardCode(); String cardCode = createPrepayRequestDto.getCardCode();
String transId = createPrepayRequestDto.getTransId(); String transId = createPrepayRequestDto.getTransId();
...@@ -2959,6 +2959,17 @@ public class OrderServiceImpl implements Orderservice { ...@@ -2959,6 +2959,17 @@ public class OrderServiceImpl implements Orderservice {
return paymentRequest; return paymentRequest;
} }
private PaymentRequest orderBodyConvertToPaymentBody(String openId, String partnerId, String appId, String payCode,String storeId) {
PaymentRequest paymentRequest = this.orderBodyConvertToPaymentBody(openId, partnerId, appId, payCode);
// fisherman 2227 测试商户号, 下个版本需要删除
boolean isTrue = "2080".equals(partnerId) || "2227".equals(partnerId);
if (isTrue) {
//【ID1035981】【蜜雪冰城】订单C端，拼接order_body字段：蜜雪冰城+门店编号
paymentRequest.setPrincipalName("蜜雪冰城"+ storeId +"店");
}
return paymentRequest;
}
public OrderExtInfoDto getExtInfo(AssortmentCustomerInfoVo userLoginInfoDto, StoreResponse.BizVO storeResponseDto, public OrderExtInfoDto getExtInfo(AssortmentCustomerInfoVo userLoginInfoDto, StoreResponse.BizVO storeResponseDto,
Integer pushOrderTime, CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto) { Integer pushOrderTime, CreateOrderVo createOrderVo, ShoppingCartGoodsDto shoppingCartGoodsDto) {
...@@ -3382,7 +3393,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -3382,7 +3393,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, null); PaymentRequest paymentRequest = orderBodyConvertToPaymentBody(userLoginInfoDto.getOpenId(), createOrderVo.getPartnerId(), appId, null,fatherBeanListOne.getShopId());
//支付金额异常 //支付金额异常
if (totalAmount < 0) { if (totalAmount < 0) {
throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR); throw new ServiceException(ResponseResult.PAY_AMOUNT_ERROR);
......
order-management/pom.xml
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>assortment-ordercenter-sdk</artifactId> <artifactId>assortment-ordercenter-sdk</artifactId>
<version>2.2-RELEASE</version> <version>2.3.1-RELEASE</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
......
ordercenter-sdk/pom.xml
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<!-- 版本号在最外层pom设置,其他服务使用聚合订单sdk,版本号往上升级,无需提交版本号,记录好readme.md,后续看readme.md往上加版本 --> <!-- 版本号在最外层pom设置,其他服务使用聚合订单sdk,版本号往上升级,无需提交版本号,记录好readme.md,后续看readme.md往上加版本 -->
<!-- <version>1.3.66.RELEASE</version>--> <!-- <version>1.3.67.RELEASE</version>-->
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<dependencies> <dependencies>
......
ordercenter-sdk/readme.md
...@@ -102,4 +102,5 @@ ...@@ -102,4 +102,5 @@
| 1.3.63.RELEASE | 开放平台取消订单调用oms | 张志恒 | 2021-07-01 | | 1.3.63.RELEASE | 开放平台取消订单调用oms | 张志恒 | 2021-07-01 |
| 1.3.64.RELEASE | 小助手日结统计订单查询和售后列表查询改为从库查询 | 刘继明 | 2021-07-19 | | 1.3.64.RELEASE | 小助手日结统计订单查询和售后列表查询改为从库查询 | 刘继明 | 2021-07-19 |
| 1.3.65.RELEASE | 聚合层sdk异常，版本引不到，解决代码报错 | 王航航 | 2021-07-20 | | 1.3.65.RELEASE | 聚合层sdk异常，版本引不到，解决代码报错 | 王航航 | 2021-07-20 |
| 1.3.66.RELEASE | 基础订单sdk版本升级 | 伍平 | 2021-08-10 | | 1.3.66.RELEASE | 基础订单sdk版本升级 | 伍平 | 2021-08-10 |
\ No newline at end of file | 1.3.67.RELEASE | 新增爱马哥需求代码改动 | 周晓航 | 2021-08-23 |
\ No newline at end of file
shopping-cart-application-service/pom.xml
...@@ -51,6 +51,7 @@ ...@@ -51,6 +51,7 @@
<dependency> <dependency>
<groupId>cn.freemud</groupId> <groupId>cn.freemud</groupId>
<artifactId>ordercenter-sdk</artifactId> <artifactId>ordercenter-sdk</artifactId>
<!-- <version>1.4.0-SNAPSHOT</version>-->
</dependency> </dependency>
<!-- <dependency>--> <!-- <dependency>-->
<!-- <groupId>com.freemud.application.service.sdk</groupId>--> <!-- <groupId>com.freemud.application.service.sdk</groupId>-->
......
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