Skip to content

O
order-group
Commit 2951b24e by xiaoer.li@freemud.com
Options

Merge remote-tracking branch 'remotes/origin/feature/19.24_买一赠一活动优化' into develop 

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
#	order-application-service/pom.xml
#	order-management/pom.xml
#	ordercenter-sdk/pom.xml
#	ordercenter-sdk/readme.md
parents 5a8acb58 ab59cc5e
Showing with 40 additions and 39 deletions
assortment-ordercenter-sdk/readme.md
...@@ -28,24 +28,15 @@ ...@@ -28,24 +28,15 @@
| 1.4.2-SNAPSHOT | 核销券码失败订单状态闭环开发 | 侯书虎 | 2020-04-08 | | 1.4.2-SNAPSHOT | 核销券码失败订单状态闭环开发 | 侯书虎 | 2020-04-08 |
| 1.4.3-SNAPSHOT | 查询订单返回新增参数 | 侯书虎 | 2020-04-08 | | 1.4.3-SNAPSHOT | 查询订单返回新增参数 | 侯书虎 | 2020-04-08 |
| 1.4.4-SNAPSHOT | 订单扩展信息 | 丁凯 | 2020-04-13 | | 1.4.4-SNAPSHOT | 订单扩展信息 | 丁凯 | 2020-04-13 |
| 1.2.8.RELEASE | 增加延时队列 | 海波 | 2020-04-13 |
| 1.2.9.RELEASE | oms接单 | 侯书虎 | 2020-04-13 |
| 1.3.0.RELEASE | app订单 | 丁凯 | 2020-04-20 |
| 1.4.5-SNAPSHOT | 订单app渠道 | 丁凯 | 2020-04-16 | | 1.4.5-SNAPSHOT | 订单app渠道 | 丁凯 | 2020-04-16 |
| 1.4.7-SNAPSHOT | 去掉无用字符写入ext_info | 李小二 | 2020-04-17 | | 1.4.7-SNAPSHOT | 去掉无用字符写入ext_info | 李小二 | 2020-04-17 |
| 1.4.8-SNAPSHOT | 增加实际配送费 | 海波 | 2020-04-17 | | 1.4.8-SNAPSHOT | 增加实际配送费 | 海波 | 2020-04-17 |
| 1.3.1.RELEASE | queryOrderById返回新增商家、平台优惠 | 侯书虎 | 2020-04-20 |
| 1.3.2.RELEASE | ext_info 增加stapleFood主食设置 | 李小二 | 2020-04-20 |
| 1.3.3.RELEASE | 第三方外卖单配送费类型与新用户立减类型重复区分 | wuping | 2020-04-21 |
| 1.5.0-SNAPSHOT | APP渠道 | 丁凯 | 2020-04-22 | | 1.5.0-SNAPSHOT | APP渠道 | 丁凯 | 2020-04-22 |
| 1.5.1-SNAPSHOT | oms订单正向操作 | 侯书虎 | 2020-04-23 | | 1.5.1-SNAPSHOT | oms订单正向操作 | 侯书虎 | 2020-04-23 |
| 1.5.2-SNAPSHOT | 预约单打印 | 海波 | 2020-04-23 | | 1.5.2-SNAPSHOT | 预约单打印 | 海波 | 2020-04-23 |
| 1.5.3-SNAPSHOT | 放开常用方法修饰符 | 李小二 | 2020-04-23 | | 1.5.3-SNAPSHOT | 放开常用方法修饰符 | 李小二 | 2020-04-23 |
| 1.5.4-SNAPSHOT | 优化ES查询sdk方法 | 海波 | 2020-04-24 | | 1.5.4-SNAPSHOT | 优化ES查询sdk方法 | 海波 | 2020-04-24 |
| 1.5.5-SNAPSHOT | 订单渠道类型新增支付宝 | 书虎 | 2020-04-24 | | 1.5.5-SNAPSHOT | 订单渠道类型新增支付宝 | 书虎 | 2020-04-24 |
| 1.3.4.RELEASE | 记录真实配送费 | 海波 | 2020-04-27 |
| 1.3.5.RELEASE | oms正向履单流程 | 侯书虎 | 2020-04-27 |
| 1.3.6.RELEASE | 蜜雪 | 丁凯 | 2020-04-27 |
| 1.5.6-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 | | 1.5.6-SNAPSHOT | 返回售后单创建时间 | wuping | 2020-04-27 |
| 1.5.7-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 | | 1.5.7-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
| 1.5.8-SNAPSHOT | 费用实体添加字段:实际费用 | 胡超 | 2020-04-29 | | 1.5.8-SNAPSHOT | 费用实体添加字段:实际费用 | 胡超 | 2020-04-29 |
...@@ -54,17 +45,11 @@ ...@@ -54,17 +45,11 @@
| 1.6.1-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 | | 1.6.1-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 |
| 1.6.2-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 | | 1.6.2-SNAPSHOT | 增加售后阶段 | 海波 | 2020-05-07 |
| 1.6.3-SNAPSHOT | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-07 | | 1.6.3-SNAPSHOT | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-07 |
| 1.3.7.RELEASE | 放开常用方法修饰符 | 李小二 | 2020-04-27 |
| 1.6.5-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 | | 1.6.5-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
| 1.6.6-SNAPSHOT | 退单增加配送费字段 | 海波 | 2020-05-12 | | 1.6.6-SNAPSHOT | 退单增加配送费字段 | 海波 | 2020-05-12 |
| 1.6.7-SNAPSHOT | 开放平台订单详情补全信息 | 茹祥 | 2020-05-12 | | 1.6.7-SNAPSHOT | 开放平台订单详情补全信息 | 茹祥 | 2020-05-12 |
| 1.6.8-SNAPSHOT | 退配送费增加默认值 | 海波 | 2020-05-12 | | 1.6.8-SNAPSHOT | 退配送费增加默认值 | 海波 | 2020-05-12 |
| 1.6.9-SNAPSHOT | 券码接口添加组织机构ID | 胡超 | 2020-05-12 | | 1.6.9-SNAPSHOT | 券码接口添加组织机构ID | 胡超 | 2020-05-12 |
| 1.3.8.RELEASE | 配送费时间金额 | 胡超 | 2020-05-11 |
| 1.3.9.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
| 1.4.0.RELEASE | ES查询优化预约单提醒优化 | 海波 | 2020-05-11 |
| 1.4.1.RELEASE | 返回储值卡支付订单支付金额 | 李小二 | 2020-05-11 |
| 1.4.2.RELEASE | 申请退款切取消接口新增超时时间字段 | 伍平 | 2020-05-12 |
| 1.7.6-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-14 | | 1.7.6-SNAPSHOT| 订单查询返回配送渠道字段 | 雷后领 | 2020-05-14 |
| 1.7.2-SNAPSHOT| 规范extInfo字段 | 侯书虎 | 2020-05-14 | | 1.7.2-SNAPSHOT| 规范extInfo字段 | 侯书虎 | 2020-05-14 |
| 1.7.3-SNAPSHOT| 客如云 | 海波 | 2020-05-14 | | 1.7.3-SNAPSHOT| 客如云 | 海波 | 2020-05-14 |
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
...@@ -144,6 +144,10 @@ public class BaseCreateOrderRequest extends BaseConfig { ...@@ -144,6 +144,10 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/ */
public ActivityUpdateStockRequest activityUpdateStockRequest; public ActivityUpdateStockRequest activityUpdateStockRequest;
/**
* 订单渠道
*/
private String menuType;
/** /**
* 省 * 省
...@@ -160,13 +164,9 @@ public class BaseCreateOrderRequest extends BaseConfig { ...@@ -160,13 +164,9 @@ public class BaseCreateOrderRequest extends BaseConfig {
*/ */
private String region; private String region;
/**
* 订单渠道
*/
private String menuType;
private Byte payChannelType; private Byte payChannelType;
@Data @Data
public static class DeliveryTypeInfo { public static class DeliveryTypeInfo {
/** /**
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java
...@@ -197,7 +197,6 @@ public class QueryOrdersResponse { ...@@ -197,7 +197,6 @@ public class QueryOrdersResponse {
* 手机号 * 手机号
*/ */
private String phone; private String phone;
private String posId; private String posId;
private String remark; private String remark;
/** /**
...@@ -387,6 +386,15 @@ public class QueryOrdersResponse { ...@@ -387,6 +386,15 @@ public class QueryOrdersResponse {
private String expressChannelName; private String expressChannelName;
/** /**
* 签收时间 送达时间 收货时间
*/
private Long gmtReceiveTime;
/**
* 完成时间
*/
private Long gmtCompleteTime;
/**
* 下游POS商编号 * 下游POS商编号
*/ */
private String downstreamPosCode; private String downstreamPosCode;
...@@ -397,15 +405,6 @@ public class QueryOrdersResponse { ...@@ -397,15 +405,6 @@ public class QueryOrdersResponse {
private String downstreamThirdOrderCode; private String downstreamThirdOrderCode;
/**
* 签收时间 送达时间 收货时间
*/
private Long gmtReceiveTime;
/**
* 完成时间
*/
private Long gmtCompleteTime;
@NoArgsConstructor @NoArgsConstructor
@Data @Data
public static class AddDeliveryInfo { public static class AddDeliveryInfo {
......
assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
...@@ -1424,10 +1424,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService { ...@@ -1424,10 +1424,10 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
|| OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType()) || OrderType.RESERVED_DINE_IN.equals(baseQueryOrderRequest.getOrderType())
|| OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){ || OrderType.RESERVED_SELF_PICKUP.equals(baseQueryOrderRequest.getOrderType())){
//外卖预约单 //外卖预约单
if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) && // if(OrderType.RESERVED_EXPRESS.equals(baseQueryOrderRequest.getOrderType()) &&
configuration != null && configuration.getDeliveryOrderWarnTime() != null){ // configuration != null && configuration.getDeliveryOrderWarnTime() != null){
orderWarnTime = configuration.getDeliveryOrderWarnTime(); // orderWarnTime = configuration.getDeliveryOrderWarnTime();
} // }
OrderTaskReq orderTask = new OrderTaskReq(); OrderTaskReq orderTask = new OrderTaskReq();
orderTask.setTaskType(3); orderTask.setTaskType(3);
Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime)); Date processingDate = DateUtil.addMinutes(DateUtil.convert2Date(baseQueryOrderRequest.getExpectTime(), DateUtil.FORMAT_YYYY_MM_DD_HHMMSS), -getMinTime(orderWarnTime));
......
order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
...@@ -913,7 +913,7 @@ public class OrderAdapter { ...@@ -913,7 +913,7 @@ public class OrderAdapter {
.map(PayStatus::getDesc).orElse("")); .map(PayStatus::getDesc).orElse(""));
responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : ""); responseVo.setPayVoucher(orderExtInfoDto != null ? orderExtInfoDto.getPayTransId() : "");
responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : ""); responseVo.setPayCreateTime(orderExtInfoDto != null ? orderExtInfoDto.getPayDate() : "");
responseVo.setPayChannel(responseVo.getPayChannel()); responseVo.setPayChannel(ordersBean.getPayChannel());
if(ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel()) ){ if(ordersBean.getPayChannel() != null && "10102".equals(ordersBean.getPayChannel()) ){
responseVo.setOrderPayType("储值卡支付"); responseVo.setOrderPayType("储值卡支付");
}else { }else {
......
order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
...@@ -1140,7 +1140,7 @@ public class OrderServiceImpl implements Orderservice { ...@@ -1140,7 +1140,7 @@ public class OrderServiceImpl implements Orderservice {
isRefundDeliveryFee = false; isRefundDeliveryFee = false;
} }
if(PayChannel.SVC.getCode().equals(orderBean.getPayChannel())){ if(PayChannel.SVC.getCode().equals(orderBean.getPayChannel())){
isRefundDeliveryFee = false; isRefundDeliveryFee = true;
} }
// 未接单 // 未接单
......
order-management/src/main/java/cn/freemud/management/adapter/MessagePushAdapter.java
...@@ -8,12 +8,16 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto; ...@@ -8,12 +8,16 @@ import com.freemud.application.sdk.api.structure.request.PushMessageNoticeDto;
import com.freemud.sdk.api.assortment.message.enums.MessageEventType; import com.freemud.sdk.api.assortment.message.enums.MessageEventType;
import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest; import com.freemud.sdk.api.assortment.message.request.MessagePushOrderTemplateRequest;
import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest; import com.freemud.sdk.api.assortment.message.request.MessageTemplateRequest;
import com.freemud.sdk.api.assortment.order.adapter.OrderSdkAdapter;
import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse; import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
import org.apache.commons.lang.ObjectUtils; import org.apache.commons.lang.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
@Component @Component
public class MessagePushAdapter { public class MessagePushAdapter {
@Autowired
private OrderSdkAdapter orderSdkAdapter;
public PushMessageNoticeDto convent2PushMessageNoticeDto(Integer targetType, String partnerId, public PushMessageNoticeDto convent2PushMessageNoticeDto(Integer targetType, String partnerId,
String storeId, String userId, String oid, Integer deliveryStatus, Integer cmdType) { String storeId, String userId, String oid, Integer deliveryStatus, Integer cmdType) {
...@@ -54,7 +58,7 @@ public class MessagePushAdapter { ...@@ -54,7 +58,7 @@ public class MessagePushAdapter {
if (extInfo != null) { if (extInfo != null) {
content.setFromAppId(extInfo.getFromAppId()); content.setFromAppId(extInfo.getFromAppId());
} }
//content.setDeliveryStatus(deliveryStatus); content.setOrderClient(orderSdkAdapter.getNewOrderClient(order.getSource()));
content.setPickUpGoodsNo(order.getOtherCode()); content.setPickUpGoodsNo(order.getOtherCode());
content.setUserId(order.getUserId()); content.setUserId(order.getUserId());
content.setOrderState(order.getStatus()); content.setOrderState(order.getStatus());
......
ordercenter-sdk/readme.md
...@@ -39,3 +39,12 @@ ...@@ -39,3 +39,12 @@
| 1.4.7-SNAPSHOT | 增加订单支付方式类型 | 海波 | 2020-05-18 | | 1.4.7-SNAPSHOT | 增加订单支付方式类型 | 海波 | 2020-05-18 |
| 1.4.8-SNAPSHOT | 售后ES查询增加跟踪号 | 海波 | 2020-05-25 | | 1.4.8-SNAPSHOT | 售后ES查询增加跟踪号 | 海波 | 2020-05-25 |
| 1.4.9-SNAPSHOT | 客如云接口 | 海波 | 2020-05-26 | | 1.4.9-SNAPSHOT | 客如云接口 | 海波 | 2020-05-26 |
| 1.2.6.RELEASE | 增加售后阶段 | 海波 | 2020-05-14 |
| 1.2.7.RELEASE | 全单退增加是否退配送费 | 海波 | 2020-05-14 |
| 1.1.9-SNAPSHOT | 创建订单增加appid字段 | wuping | 2020-05-08 |
| 1.2.8.RELEASE | 1.1.9-SNAPSHOT升RELEASE版本 | wuping | 2020-05-18 |
| 1.2.9.RELEASE | 规范orderExtInfoDto | 侯书虎 | 2020-05-19 |
| 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
| 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
| 1.2.10.RELEASE | 增加售后单任务 | wuping | 2020-05-21 |
| 1.2.11.RELEASE | 增加订单支付方式 | 海波 | 2020-05-25 |
\ No newline at end of file
shopping-cart-application-service/src/main/java/cn/freemud/interceptor/ConfigInitBean.java
...@@ -54,6 +54,6 @@ public class ConfigInitBean { ...@@ -54,6 +54,6 @@ public class ConfigInitBean {
@Profile("pre-release") @Profile("pre-release")
@Bean @Bean
IUrlConfig preIUrlConfig() { IUrlConfig preIUrlConfig() {
return new UrlConfig(ConstantProfiles.PRO); return new UrlConfig(ConstantProfiles.PRE);
} }
} }
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java
...@@ -86,6 +86,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService { ...@@ -86,6 +86,7 @@ public class BuyAndGiftsPromotionService implements IPromotionService {
cartGoods.setStockLimit(ObjectUtils.equals(1, product.getStockLimit())); cartGoods.setStockLimit(ObjectUtils.equals(1, product.getStockLimit()));
cartGoods.setCustomerCode(product.getCustomerCode()); cartGoods.setCustomerCode(product.getCustomerCode());
cartGoods.setUnit(product.getUnit()); cartGoods.setUnit(product.getUnit());
cartGoods.setWeight(product.getWeight());
cartGoods.setQty(sendGoods.getSendNumber()); cartGoods.setQty(sendGoods.getSendNumber());
// nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额 // nodeId标识activeCode,用于计算均摊时每个商品在每个活动上均摊金额
cartGoods.setNodeId(sendActivity.getActivityCode()); cartGoods.setNodeId(sendActivity.getActivityCode());
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuySendPromotionService.java
...@@ -221,7 +221,7 @@ public class BuySendPromotionService implements IPromotionService { ...@@ -221,7 +221,7 @@ public class BuySendPromotionService implements IPromotionService {
} }
ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getSpuId()); ActivityCalculationDiscountResponseDto.CalculationDiscountResult.SendActivity.SendGoods sendGoods = sendGoodsMap.get(cartGood.getSpuId());
CartGoods cartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice()); CartGoods cartGoods = shoppingCartConvertAdapter.convent2CartGoods(cartGood, sendGoods.getNowPrice());
cartGoods.setQty(SEND_NUMBER); cartGoods.setQty(sendGoods.getSendNumber() > 0 ? sendGoods.getSendNumber() : SEND_NUMBER);
newCartGoodsList.add(cartGoods); newCartGoodsList.add(cartGoods);
} }
......
shopping-cart-application-service/src/main/java/cn/freemud/service/impl/FullPromotionService.java
...@@ -11,6 +11,7 @@ import cn.freemud.service.IPromotionService; ...@@ -11,6 +11,7 @@ import cn.freemud.service.IPromotionService;
import cn.freemud.utils.WebUtil; import cn.freemud.utils.WebUtil;
import com.freemud.application.sdk.api.promotioncenter.request.promotion.UnifyActivityRequest; import com.freemud.application.sdk.api.promotioncenter.request.promotion.UnifyActivityRequest;
import com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService; import com.freemud.application.sdk.api.promotioncenter.service.PromotionSdkService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
...@@ -34,6 +35,7 @@ import java.util.stream.Collectors; ...@@ -34,6 +35,7 @@ import java.util.stream.Collectors;
* 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目 * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
*/ */
@Service @Service
@Slf4j
public class FullPromotionService implements IPromotionService { public class FullPromotionService implements IPromotionService {
@Autowired @Autowired
......
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