Merge remote-tracking branch 'remotes/origin/feature-2020/5/12-1.9.22-退单增加配送费选项-海波' into qa

# Conflicts:
#	assortment-ordercenter-sdk/pom.xml
#	assortment-ordercenter-sdk/readme.md
#	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java
#	order-application-service/pom.xml
#	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
#	order-management/pom.xml
#	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java

@@ -517,7 +517,7 @@ public class OrderSdkAdapter {
         orderConditionsReq.setOrderCodes(request.getOrderIds());
         orderConditionsReq.setPartnerId(request.getCompanyId());
         orderConditionsReq.setPageSize(request.getPageSize());
-        orderConditionsReq.setPageNum(request.getPageNumber());
+        orderConditionsReq.setPageNum(request.getPageNumber()>0?request.getPageNumber():0);
         orderConditionsReq.setMobile(request.getPhoneNo());
         orderConditionsReq.setStoreIds(request.getShopIds());
         orderConditionsReq.setPayStatuses(request.getPayStatuses());
@@ -880,6 +880,8 @@ public class OrderSdkAdapter {
         data.setOid(orderInfoReqs.getOrderCode());
         data.setOrderType(getOldOrderType(orderInfoReqs.getOrderType()));
         data.setAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
+        data.setSettlementAmount(orderInfoReqs.getSettlementAmount() == null ? 0L : orderInfoReqs.getSettlementAmount().longValue());
+        data.setActualPayAmount(orderInfoReqs.getActualPayAmount() == null ? 0L : orderInfoReqs.getActualPayAmount().longValue());
         data.setUserId(orderInfoReqs.getUserId());
         data.setUserName(orderInfoReqs.getUserName());
         data.setType(getOldOrderType(orderInfoReqs.getOrderType()));

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CancelOrderRequest.java

@@ -63,4 +63,9 @@ public class CancelOrderRequest extends BaseConfig {
 
     //操作人
     private String operator;
+
+    /**
+     * 是否退配送费
+     */
+    private boolean isRefundDeliveryAmount;
 }

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/response/order/QueryOrdersResponse.java

@@ -104,6 +104,14 @@ public class QueryOrdersResponse {
              */
             private Long amount;
             /**
+             * 用户在界面上看到的支付金额，单位分
+             */
+            private Long settlementAmount;
+            /*
+            * 实际支付金额
+            */
+            private Long actualPayAmount;
+            /**
              * 吧台桌号
              */
             private String barCounter;

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/service/order/OrderCenterSdkServiceImpl.java

@@ -497,6 +497,7 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             OrderTaskReq orderTask = setAfterSalesOrderTimeOutTask();
             request.setOrderTask(orderTask);
         }
+        request.setRefundDeliveryAmount(cancelOrderRequest.isRefundDeliveryAmount());
         com.freemud.application.sdk.api.ordercenter.response.BaseResponse response = orderSdkService.cancelOrder(request, cancelOrderRequest.getTrackingNo());
         return orderSdkAdapter.convent2BaseOrderResponse(response);
     }
@@ -691,8 +692,8 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
     public QueryOrdersResponse getOrderListByES(QueryOrdersByConditionsRequest queryOrdersByConditionsRequest) {
         OrderConditionsReq request = orderSdkAdapter.convent2QueryOrdersByConditionsRequest(queryOrdersByConditionsRequest);
         BaseDownLoadResponse<List<OrderInfoReqs>> baseDownLoadResponse = orderDownLoadSdkService.queryOrderByConditions(request, "");
-        if (ObjectUtils.notEqual("100", baseDownLoadResponse.getCode()) || StringUtils.isEmpty(baseDownLoadResponse.getScrollId()) ||
-                CollectionUtils.isEmpty(baseDownLoadResponse.getResult())) {
+
+        if (ObjectUtils.notEqual("100", baseDownLoadResponse.getCode()) || CollectionUtils.isEmpty(baseDownLoadResponse.getResult())) {
             QueryOrdersResponse queryOrdersResponse = new QueryOrdersResponse();
             queryOrdersResponse.setErrcode(Integer.parseInt(baseDownLoadResponse.getCode()));
             QueryOrdersResponse.DataBean dataBean = new QueryOrdersResponse.DataBean();
@@ -702,6 +703,11 @@ public class OrderCenterSdkServiceImpl implements OrderCenterSdkService {
             queryOrdersResponse.setData(dataBean);
             return queryOrdersResponse;
         }
+
+        if(request.getPageNum()>0){
+            return orderSdkAdapter.convent2OrdersResponseByES(baseDownLoadResponse);
+        }
+
         List<OrderInfoReqs> list = new ArrayList<>();
         list.addAll(baseDownLoadResponse.getResult());
         if (baseDownLoadResponse.getTotalNum() > queryOrdersByConditionsRequest.getPageSize()) {

assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/util/LockUtils.java

@@ -13,10 +13,14 @@ public class LockUtils {
     private static String redis_lock_after="saas:lockAfter:";
 
     public static Boolean lockAfter(RedisTemplate redisTemplate,String afterId){
-        return lock(redisTemplate,redis_lock_after+afterId);
+        return redisLock(redisTemplate,redis_lock_after+afterId);
     }
 
-    private static boolean lock(RedisTemplate redisTemplate,String key){
+    public static Boolean lock(RedisTemplate redisTemplate,String key,Long second){
+        return redisLockByTime(redisTemplate,key,second);
+    }
+
+    private static boolean redisLock(RedisTemplate redisTemplate,String key){
         String lock =  key;
         // 利用lambda表达式
         return (Boolean) redisTemplate.execute((RedisCallback) connection -> {
@@ -32,4 +36,21 @@ public class LockUtils {
         });
     }
 
+    private static boolean redisLockByTime(RedisTemplate redisTemplate,String key,Long second){
+        String lock =  key;
+        Long lockSecond = second;
+        // 利用lambda表达式
+        return (Boolean) redisTemplate.execute((RedisCallback) connection -> {
+            long expireAt = second;
+            Boolean acquire = connection.setNX(lock.getBytes(), String.valueOf(expireAt).getBytes());
+
+            if (acquire) {
+                connection.expire(lock.getBytes(),expireAt);
+                return true;
+            } else {
+                return false;
+            }
+        });
+    }
+
 }

order-application-service/src/main/java/cn/freemud/amp/service/ProduceMQService.java

@@ -10,10 +10,12 @@ import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
 import com.alibaba.fastjson.JSON;
 import com.google.common.base.Throwables;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.BooleanUtils;
 import org.apache.rocketmq.client.producer.SendResult;
 import org.apache.rocketmq.common.message.MessageConst;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.messaging.Message;
 import org.springframework.messaging.support.MessageBuilder;
 import org.springframework.stereotype.Service;
@@ -32,26 +34,36 @@ public class ProduceMQService {
     @Resource
     private RocketMQTemplate deliveryRocketMqTemplate;
 
+    @Value("${rocketmq.delivery.enable:false}")
+    private Boolean rocketMQDeliveryEnable;
+
     /**
-     * @Description 发现配送信息到rabbitMQ
      * @param deliveryRequest
+     * @Description 发现配送信息到rabbitMQ
      */
     public void sendOfDeliveryInfo(CallbackUrlRequestDto deliveryRequest) {
         Header header = new Header(MQAction.UPDATE.getAction(), "delivery/callbackUrl", deliveryRequest.getOrderId(), "open-platform-order-delivery-queue");
         MQMessage<CallbackUrlRequestDto> mqMessage = new MQMessage<>(header, deliveryRequest);
-        mqService.convertAndSend(PushOrderConfig.EXCHANGE_NAME, PushOrderConfig.OPEN_PLATFORM_ORDER_DELIVERY_ROUTING_KEY, mqMessage);
+        try {
+            mqService.convertAndSend(PushOrderConfig.EXCHANGE_NAME, PushOrderConfig.OPEN_PLATFORM_ORDER_DELIVERY_ROUTING_KEY, mqMessage);
+        } catch (Exception e) {
+            log.error("sendOfDeliveryInfo.error, message:{}, cause:{}", JSON.toJSONString(deliveryRequest), Throwables.getStackTraceAsString(e));
+        }
     }
 
     /**
-     * @Description 发送配送信息到rocketMq:
      * @param deliveryRequest
+     * @Description 发送配送信息到rocketMq:
      */
     public void sendRocketMqOfDeliveryInfo(CallbackUrlRequestDto deliveryRequest) {
+
+        if (BooleanUtils.isNotTrue(rocketMQDeliveryEnable)) {
+            return;
+        }
+
         Header header = new Header(MQAction.UPDATE.getAction(), "delivery/callbackUrl", deliveryRequest.getOrderId(), RocketMQConst.ORDER_THIRD_PUSH_TOPIC);
         MQMessage<CallbackUrlRequestDto> mqMessage = new MQMessage(header, deliveryRequest);
-
         String destination = String.format("%s:%s", RocketMQConst.ORDER_THIRD_PUSH_TOPIC, RocketMQConst.OrderSubsidiaryTag.delivery);
-
         Message message = MessageBuilder
                 .withPayload(mqMessage)
                 .setHeader("partnerId", deliveryRequest.getPartnerId())

order-application-service/src/main/java/cn/freemud/enums/OrderRefundEnum.java

@@ -18,7 +18,8 @@ public enum OrderRefundEnum {
     REFUND_DATA_RANGE("refundDateRange", "退款允许日期"),
     TAKEORDER_REFUND("takeOrderRefund", "未接单是否支持退款"),
     RECEIPTORDER_REFUND("receiptOrderRefund", "已接单是否支持退款"),
-    COMPLETEMAKEORDER_REFUND("completeMakeOrderRefund", "制作完成是否支持退款");
+    COMPLETEMAKEORDER_REFUND("completeMakeOrderRefund", "制作完成是否支持退款"),
+    REFUND_DELIVERY_FEE_ENABLE("refundShippingFee","商家同意退款时是否退配送费");
 
     private String keyValue;
 

order-application-service/src/main/java/cn/freemud/enums/PayChannel.java

+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @Title: OrderType
+ * @Package cn.freemud.enums
+ * @Description: 订单状态
+ * @author: liming.guo
+ * @date: 2018/5/21 14:43
+ * @version V1.0
+ * @Copyright: 2018 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+package cn.freemud.enums;
+
+public enum PayChannel {
+
+    SVC("10102", "svc卡支付");
+
+    private String code;
+    private String desc;
+
+    PayChannel(String code, String desc) {
+        this.code = code;
+        this.desc = desc;
+    }
+
+    public static PayChannel getByCode(String code) {
+        for (PayChannel payType : values()) {
+            if (payType.getCode().equals(code)) {
+                return payType;
+            }
+        }
+        return null;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
+}

order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java

 package cn.freemud.service.delivery;
 
 import cn.freemud.amp.service.ProduceMQService;
-import cn.freemud.amqp.Header;
-import cn.freemud.amqp.MQAction;
-import cn.freemud.amqp.MQMessage;
 import cn.freemud.base.entity.BaseResponse;
 import cn.freemud.entities.dto.delivery.CallbackUrlRequestDto;
 import cn.freemud.entities.dto.delivery.QueryDeliveryAmountRequestDto;
@@ -131,6 +128,7 @@ public class ThirdDeliveryServiceImpl implements ThirdDeliveryService {
 
         // 订单配送状态变化时发送到MQ
         if (DeliveryStatus.checkDeliveryStatueForPlatform(deliveryStatus)) {
+            produceMQService.sendOfDeliveryInfo(request);
             produceMQService.sendRocketMqOfDeliveryInfo(request);
         }
 //        else {

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -51,16 +51,14 @@ import cn.freemud.utils.*;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentCloudPrinter;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformPartnerConfig;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxapp;
-import com.freemud.api.assortment.datamanager.entity.db.AssortmentOpenPlatformWxappAuthorizer;
+import com.freemud.api.assortment.datamanager.entity.db.*;
 import com.freemud.api.assortment.datamanager.entity.vo.AssortmentCustomerInfoVo;
 import com.freemud.api.assortment.datamanager.manager.AssortmentCloudPrinterManager;
 import com.freemud.api.assortment.datamanager.enums.IappIdType;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformPartnerConfigManager;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappAuthorizerManager;
 import com.freemud.api.assortment.datamanager.manager.AssortmentOpenPlatformWxappManager;
+import com.freemud.api.assortment.datamanager.manager.cache.CacheOpenPlatformPartnerWxappConfigManager;
 import com.freemud.api.assortment.datamanager.manager.customer.AssortmentCustomerInfoManager;
 import com.freemud.api.assortment.datamanager.meal.MealCacheManager;
 import com.freemud.application.sdk.api.constant.ResponseConstant;
@@ -116,6 +114,7 @@ import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang.builder.ToStringBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
@@ -126,6 +125,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static cn.freemud.constant.OrderRefundConstant.ALLOW_REFUND;
+
 @Service
 @Slf4j
 public class OrderServiceImpl implements Orderservice {
@@ -216,7 +217,8 @@ public class OrderServiceImpl implements Orderservice {
     private PaymentNewClient paymentNewClient;
     @Autowired
     private MallOrderServiceImpl mallOrderService;
-
+    @Autowired
+    private CacheOpenPlatformPartnerWxappConfigManager cacheOpenPlatformPartnerWxappConfigManager;
 
 
     @Override
@@ -1160,17 +1162,18 @@ public class OrderServiceImpl implements Orderservice {
                 // 删除订单 通知活动添加商品库存
                 backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
             } else {
-//                com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest var1 = new com.freemud.sdk.api.assortment.order.request.order.OrderRefundRequest();
-//                OrderRefundRequestDto orderRefundRequestDto = orderAdapter.convent2OrderRefundRequestDto(orderRefundVo, orderBean.getOid());
-//                BeanUtil.convertBean(orderRefundRequestDto, var1);
-//                var1.setTrackingNo(LogTreadLocal.getTrackingNo());
-//                var1.setPartnerId(orderRefundVo.getPartnerId());
-//                var1.setStoreId(orderBean.getShopId());
-//                var1.setOrderStatus(orderBean.getStatus());
-//                var1.setOperator(orderBean.getUserName());
-//                BaseOrderResponse baseResponseDto = orderCenterSdkService.orderRefund(var1);
+                List<AssortmentOpenPlatformPartnerWxappConfig> partnerWxappConfigs = cacheOpenPlatformPartnerWxappConfigManager.cacheSelectDefaultPage(userInfo.getWxAppId(), "2");
 
+                Map<String, AssortmentOpenPlatformPartnerWxappConfig> configMap = partnerWxappConfigs.stream().collect(Collectors.toMap(AssortmentOpenPlatformPartnerWxappConfig::getAppKey, Function.identity()));
 
+                boolean isRefundDeliveryFee = true;
+                AssortmentOpenPlatformPartnerWxappConfig refundDeliveryFeeConfig = configMap.get(OrderRefundEnum.REFUND_DELIVERY_FEE_ENABLE.getKeyValue());
+                log.info("refundAgree.refundShippingFee of oid:{}, {}", orderBean.getOid(), (null != refundDeliveryFeeConfig ? ToStringBuilder.reflectionToString(refundDeliveryFeeConfig) : null));
+                // 0、null表示 关闭 ; 1 表示开启
+                if (null != refundDeliveryFeeConfig
+                        && (!ALLOW_REFUND.equals(refundDeliveryFeeConfig.getAppValue())||PayChannel.SVC.getCode().equals(orderBean.getPayChannel()))) {
+                    isRefundDeliveryFee = false;
+                }
                 CancelOrderRequest cancelOrderRequest = new CancelOrderRequest();
                 cancelOrderRequest.setPartnerId(orderBean.getCompanyId());
                 cancelOrderRequest.setStoreId(orderBean.getShopId());
@@ -1187,6 +1190,7 @@ public class OrderServiceImpl implements Orderservice {
                 cancelOrderRequest.setReqRemark(orderRefundVo.getRemarks());
                 cancelOrderRequest.setOperator(orderBean.getUserName());
                 cancelOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+                cancelOrderRequest.setRefundDeliveryAmount(isRefundDeliveryFee);
                 BaseOrderResponse baseResponseDto = orderCenterSdkService.orderCancel(cancelOrderRequest);
 
                 if (!RESPONSE_SUCCESS_CODE.equals(baseResponseDto.getErrcode())) {
@@ -1196,7 +1200,7 @@ public class OrderServiceImpl implements Orderservice {
                     sendPosMessage(partnerId, orderBean.getShopId());
                 }
                 //通知小助手发送申请退款公众号订阅消息
-                sendApplyRefundSubscriptionNotice(orderBean,orderRefundVo);
+                sendApplyRefundSubscriptionNotice(orderBean, orderRefundVo);
                 //已接单可发起退款申请，查询门店有无云打印机，有则打印退款申请小票
                 printApplyRefundSmallTicket(orderBean, orderRefundVo);
             }

order-application-service/src/test/java/cn.freemud/service/OrderServiceTest.java

@@ -89,7 +89,7 @@ public class OrderServiceTest {
         JSONObject jsonObject = JSONObject.parseObject(string);
         QueryOrderByIdResponseDto orderByIdResponseDto = jsonObject.toJavaObject(QueryOrderByIdResponseDto.class);
         QueryOrdersResponseDto.DataBean.OrderBean orderBean = orderByIdResponseDto.getData();
-        orderService.sendApplyRefundSubscriptionNotice(orderBean,request);
+//        orderService.sendApplyRefundSubscriptionNotice(orderBean,request);
 
     }
 

ordercenter-sdk/pom.xml

@@ -8,7 +8,7 @@
         <version>1.0.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <version>1.3.4-SNAPSHOT</version>
+    <version>1.2.4.RELEASE</version>
     <artifactId>ordercenter-sdk</artifactId>
 
     <dependencies>

ordercenter-sdk/readme.md

@@ -20,3 +20,5 @@
 | 1.3.3-SNAPSHOT | 创建售后单接口增加任务 | wuping | 2020-04-27 |
 | 1.3.4-SNAPSHOT | 取消订单增加任务 | wuping | 2020-04-28 |
 | 1.2.2.RELEASE | ES查询增加异常单状态 | 李小二 | 2020-04-27 |
+| 1.2.3.RELEASE | 配送费实际金额 | 胡超 | 2020-05-11 |
+| 1.2.4.RELEASE | 发送pos消息中心新增字段 | 侯书虎 | 2020-05-11 |
\ No newline at end of file

ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderCancelReq.java

@@ -61,6 +61,11 @@ public class OrderCancelReq {
     //操作人
     private String operator;
 
+    /**
+     * 是否退配送费
+     */
+    private boolean isRefundDeliveryAmount;
+
     private Integer timeOut;
 
     //任务