Merge branch 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

assortment-ordercenter-sdk/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <artifactId>assortment-ordercenter-sdk</artifactId>
-    <version>2.2.4-SNAPSHOT</version>
+    <version>2.1.5-RELEASE</version>
     <dependencies>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -38,7 +38,7 @@
         <dependency>
             <groupId>cn.freemud</groupId>
             <artifactId>ordercenter-sdk</artifactId>
-            <version>1.6.5-SNAPSHOT</version>
+            <version>1.3.20.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>

assortment-ordercenter-sdk/readme.md

@@ -144,4 +144,5 @@
 | 2.0.16.RELEASE | 麦咖啡问题修复 | 徐康 | 2020-11-09 |
 | 2.1.2.RELEASE | 活动扣减库存 | 缪晖 | 2020-11-11 |
 | 2.1.3-RELEASE | 退款增加自动退款配置的null判断 | 刘鹏飞 | 2020-11-12 |
-| 2.1.4-RELEASE | 退款增加自动退款配置的null判断 | 刘鹏飞 | 2020-11-12 |
+| 2.1.4-RELEASE | 退款增加自动退款配置的null判断 | 刘鹏飞 | 2020-11-12 |
\ No newline at end of file
+| 2.1.5-RELEASE | 麦咖啡权益卡金额入机 | 徐康 | 2020-11-23 |
\ No newline at end of file

order-application-service/pom.xml

@@ -315,12 +315,12 @@
         <dependency>
             <groupId>com.freemud.application.service.sdk</groupId>
             <artifactId>paymentcenter-sdk</artifactId>
-            <version>2.9.RELEASE</version>
+            <version>2.9.5.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.1.RELEASE</version>
+            <version>2.6.3.RELEASE</version>
         </dependency>
         <dependency>
             <groupId>org.apache.rocketmq</groupId>

order-application-service/src/main/java/cn/freemud/controller/OrderController.java

@@ -210,6 +210,15 @@ public class OrderController {
     }
 
     /**
+     * 取消支付订单
+     */
+    @ApiAnnotation(logMessage = "cancelPayOrder")
+    @PostMapping("/cancelPayOrder")
+    public BaseResponse cancelPayOrder(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
+        return orderservice.cancelPayOrder(deleteOrderVo);
+    }
+
+    /**
      * 取消支付删除订单
      */
     @ApiAnnotation(logMessage = "deleteOrder")

order-application-service/src/main/java/cn/freemud/service/Orderservice.java

@@ -61,6 +61,8 @@ public interface Orderservice {
      */
     BaseResponse deleteOrder(DeleteOrderVo deleteOrderVo);
 
+    BaseResponse cancelPayOrder(DeleteOrderVo deleteOrderVo);
+
     /**
      * 支付取消删除订单
      */

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

@@ -632,6 +632,13 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         try {
             UnifiedOrderRequest request = orderAdapter.convent2UnifiedOrderRequest(orderBean, paymentRequest, orderBean.getAmount(), cardAmount, transId);
             request.setInvoiceFlag(needInvoice);
+            Map<String, String> extendParams = new HashMap<>();
+            if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
+                extendParams.put("mealType", "delivery");
+            } else {
+                extendParams.put("mealType", "pickup");
+            }
+            request.setExtendParams(extendParams);
             com.freemud.application.sdk.api.base.BaseResponse<UnifiedOrderResponse> responseBase = standardPaymentService.unifiedOrder(request, trackingNo);
             if (!ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(responseBase.getCode())) {
                 log.error("支付SDK返回信息错误,trackingNo:{} request:{} response:{}", trackingNo, JSONObject.toJSONString(request), JSONObject.toJSONString(responseBase));
@@ -1177,6 +1184,13 @@ public class MCCafeOrderServiceImpl implements MCCafeOrderService {
         if (orderBean.getAmount() != 0) {
             //调用支付退款
             com.freemud.sdk.api.assortment.payment.request.OrderRefundRequest orderPayRefundRequest = orderAdapter.getOrderPayRefundRequest(orderBean, refundId, fatherOrderId);
+            Map<String, String> extendParams = new HashMap<>();
+            if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
+                extendParams.put("mealType", "delivery");
+            } else {
+                extendParams.put("mealType", "pickup");
+            }
+            orderPayRefundRequest.setExtendParams(extendParams);
             response = standardPaymentService.orderRefund(orderPayRefundRequest, LogTreadLocal.getTrackingNo());
             if (response == null || response.getData() == null || !com.freemud.sdk.api.assortment.order.domain.ResponseCodeConstant.RESPONSE_SUCCESS_STR.equals(response.getCode())) {
                 return ResponseUtil.error(ResponseResult.ORDER__ERRORREFUND.getCode(), "orderRefund_failed");

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

@@ -1518,6 +1518,44 @@ public class OrderServiceImpl implements Orderservice {
     }
 
     @Override
+    public BaseResponse cancelPayOrder(DeleteOrderVo deleteOrderVo) {
+        if (StringUtils.isBlank(deleteOrderVo.getOid())) {
+            return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "oid不能为空");
+        }
+        BaseQueryOrderRequest baseQueryOrderRequest = new BaseQueryOrderRequest();
+        baseQueryOrderRequest.setOrderId(deleteOrderVo.getOid());
+        baseQueryOrderRequest.setTrackingNo(LogTreadLocal.getTrackingNo());
+        QueryOrderByIdResponse queryOrderByIdResponse = orderCenterSdkService.queryOrderById(baseQueryOrderRequest);
+        String string = JSONObject.toJSONString(queryOrderByIdResponse);
+        JSONObject jsonObject = JSONObject.parseObject(string);
+        QueryOrderByIdResponseDto responseDto = jsonObject.toJavaObject(QueryOrderByIdResponseDto.class);
+        if (!RESPONSE_SUCCESS_CODE.equals(responseDto.getErrcode()) || responseDto.getData() == null) {
+            return ResponseUtil.error(ResponseResult.ORDER_QUERYORDER_ERROR);
+        }
+        OrderBean orderBean = responseDto.getData();
+        if (!PayStatus.NOT_PAY.getCode().equals(orderBean.getPayStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许删除");
+        }
+        if (!OrderStatus.WAIT_PAY.getCode().equals(orderBean.getStatus())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR.getCode(), "订单状态不允许删除");
+        }
+        DeleteOrderDto deleteOrderDto = orderAdapter.convent2DeleteOrderDto(deleteOrderVo.getOid());
+        //
+        CancelOrderRequest var1 = new CancelOrderRequest();
+        var1.setOrderId(deleteOrderDto.getOrderId());
+        var1.setTrackingNo(LogTreadLocal.getTrackingNo());
+        var1.setOperator("未支付取消");
+        BaseOrderResponse baseOrderResponse = orderCenterSdkService.orderCancel(var1);
+
+        if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {
+            return ResponseUtil.error(ResponseResult.ORDER_DELETE_ERROR);
+        }
+        // TODO: 2019/9/10 删除订单通知
+        backOrdersStatusChange(orderBean.getOid(), orderBean.getStatus());
+        return ResponseUtil.success();
+    }
+
+    @Override
     public BaseResponse deleteOrderById(DeleteOrderVo deleteOrderVo) {
         if (StringUtils.isBlank(deleteOrderVo.getOid())) {
             return ResponseUtil.error(ResponseResult.PARAMETER_MISSING.getCode(), "oid不能为空");
@@ -1544,7 +1582,7 @@ public class OrderServiceImpl implements Orderservice {
         DeleteOrderRequest var1 = new DeleteOrderRequest();
         var1.setOrderId(deleteOrderDto.getOrderId());
         var1.setTrackingNo(LogTreadLocal.getTrackingNo());
-        var1.setOperator("未支付删除");
+        var1.setOperator("未支付取消");
         BaseOrderResponse baseOrderResponse = orderCenterSdkService.deleteOrder(var1);
 
         if (!RESPONSE_SUCCESS_CODE.equals(baseOrderResponse.getErrcode())) {

order-management/pom.xml

@@ -71,7 +71,7 @@
         <dependency>
             <groupId>com.freemud.sdk.api.assortment</groupId>
             <artifactId>assortment-payment-sdk</artifactId>
-            <version>2.6.1-SNAPSHOT</version>
+            <version>2.6.3.RELEASE</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

order-management/src/main/java/cn/freemud/management/service/adapter/OrderBeanFactory.java

@@ -17,7 +17,7 @@ import org.springframework.stereotype.Service;
 @Service
 public class OrderBeanFactory {
 
-    @Value("${mcCafe.partnerId}")
+    @Value("${mccafe.partner.id}")
     private String macCafePartnerId;
 
     @Autowired

order-management/src/main/java/cn/freemud/management/service/adapter/OrderManagerAdapter.java

@@ -28,7 +28,7 @@ public class OrderManagerAdapter {
     private OrderBaseService orderBaseService;
     @Autowired
     private OrderBeanFactory orderBeanFactory;
-    @Value("${mcCafe.partnerId}")
+    @Value("${mccafe.partner.id}")
     private String macCafePartnerId;
 
 

order-management/src/main/java/cn/freemud/management/service/handle/PaymentHandle.java

@@ -12,6 +12,7 @@ import com.freemud.application.sdk.api.base.BaseResponse;
 import com.freemud.application.sdk.api.log.ErrorLog;
 import com.freemud.application.sdk.api.ordercenter.response.orderInfo.AfterSalesOrderResp;
 import com.freemud.application.sdk.api.ordercenter.service.OrderSdkService;
+import com.freemud.sdk.api.assortment.order.enums.OldOrderType;
 import com.freemud.sdk.api.assortment.order.enums.PayRefundStatus;
 import com.freemud.sdk.api.assortment.order.request.order.MultiOrderRefundRequest;
 import com.freemud.sdk.api.assortment.order.response.order.MultiOrderRefundResponse;
@@ -23,12 +24,15 @@ import lombok.extern.log4j.Log4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang.ObjectUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
+import java.util.HashMap;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
+import java.util.Map;
 
 /**
  * All rights Reserved, Designed By www.freemud.cn
@@ -47,6 +51,8 @@ import java.util.stream.Collectors;
 public class PaymentHandle {
 
     private static final String SUCCESS="100";
+    @Value("${mccafe.partner.id}")
+    private String macCafePartnerId;
 
     @Autowired
     private StandardPaymentService standardPaymentService;
@@ -98,6 +104,15 @@ public class PaymentHandle {
         if (ObjectUtils.equals(orderBean.getAmount(), 0L)) {
             return handlePayRefundResponse(refundStatus,orderRefundRequest.getRefundId());
         }
+        if(macCafePartnerId.equals(orderBean.getCompanyId())) {
+            Map<String, String> extendParams = new HashMap<>();
+            if(OldOrderType.TAKE_OUT.getCode().equals(orderBean.getOrderType())) {
+                extendParams.put("mealType", "delivery");
+            } else {
+                extendParams.put("mealType", "pickup");
+            }
+            orderRefundRequest.setExtendParams(extendParams);
+        }
         BaseResponse<OrderRefundResponse> orderRefundResponse;
         try {
             orderRefundResponse = standardPaymentService.orderRefund(orderRefundRequest, "");

order-management/src/main/java/cn/freemud/management/service/impl/McCafeMangerServiceImpl.java

@@ -63,7 +63,7 @@ public class McCafeMangerServiceImpl implements OrderManagerService {
     @Resource
     private CustomerMcCafeClient customerMcCafeClient;
 
-    @Value("${mcCafe.partnerId}")
+    @Value("${mccafe.partner.id}")
     private String macCafePartnerId;
     @Value("${mcCafe.withOrderBuy.cardId}")
     private String macCafeCardId;

ordercenter-sdk/readme.md

@@ -86,4 +86,5 @@
 | 1.3.16.RELEASE | 麦咖啡多规格 | 徐康 | 2020-10-09 |
 | 1.3.17.RELEASE | 集点推送改造 | 梁崇福 | 2020-10-28 |
 | 1.3.18.RELEASE | 麦咖啡加料 | 徐康 | 2020-10-30 |
+| 1.3.20.RELEASE | 麦咖啡权益卡金额入机 | 徐康 | 2020-11-23 |