Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of…

Merge branches 'feature/20210624_购买虚拟商品校验是否在菜单_wuping' and 'qa' of http://gitlab.freemud.com/order-group-application/order-group into qa

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/controller/OrderController.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

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

@@ -200,10 +200,10 @@ public class OrderController {
 
 
     /**
-     * 取消支付订单
+     * 蜜雪APP 取消支付订单
      */
     @LogIgnore(logMessage = "cancelPayOrder")
-    @PostMapping("/cancelPayOrder")
+    @PostMapping({"/cancelPayOrder","/deleteOrderById"})
     public BaseResponse cancelPayOrder(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
         return orderservice.cancelPayOrder(deleteOrderVo);
     }
@@ -220,12 +220,12 @@ public class OrderController {
     /**
      * 取消支付删除订单
      */
-    @LogIgnore(logMessage = "deleteOrderById")
-    @PostMapping("/deleteOrderById")
-    public BaseResponse deleteOrderById(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
-        //return orderservice.deleteOrderById(deleteOrderVo);
-        return orderservice.cancelPayOrder(deleteOrderVo);
-    }
+//    @LogIgnore(logMessage = "deleteOrderById")
+//    @PostMapping("/deleteOrderById")
+//    public BaseResponse deleteOrderById(@Validated @LogParams @RequestBody DeleteOrderVo deleteOrderVo) {
+//        //return orderservice.deleteOrderById(deleteOrderVo);
+//        return orderservice.cancelPayOrder(deleteOrderVo);
+//    }
 
     /**
      * 用户申请退款

order-application-service/src/main/java/cn/freemud/entities/dto/pay/MultiPaymentRespDto.java

+package cn.freemud.entities.dto.pay;
+
+
+import lombok.Data;
+
+@Data
+public class MultiPaymentRespDto {
+    private String ebCode;
+    private String endTransTradeNo;
+    private String fmTradeNo;
+    private Integer mcouponAmount;
+    private String outOrderNo;
+    private Integer payAmount;
+    private Integer pcouponAmount;
+    private String platformTradeNo;
+    private String status;
+    private String transId;
+    private String ver;
+    private String appId;
+    private String userId;
+    private String platformMchId;
+    private String tradeTime;
+    private String transCurrency;
+}

order-application-service/src/main/java/cn/freemud/entities/dto/pay/MultiQueryRequest.java

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+import lombok.ToString;
+
+@Data
+@ToString
+public class MultiQueryRequest {
+    /**
+     * 开启渠道端查询,默认不开启
+     */
+    private boolean enable_platform_data_query;
+
+    /**
+     * 外部交易流水号，由上游系统生成，需保证唯一(支付标识)
+     */
+    private String outOrderNo;
+    
+    /**
+     * 商户编号（由非码提供）
+     */
+    private Integer partnerId;
+    
+    /**
+     * 商家门店号（在线支付需要提前定义）
+     */
+    private String storeId;
+    
+    /**
+     * 接口版本，默认30
+     */
+    private String ver;
+    
+}

order-application-service/src/main/java/cn/freemud/entities/dto/pay/MultiQueryRespDto.java

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 聚合查询返回
+ */
+@Data
+public class MultiQueryRespDto<T> {
+
+    private int code;
+
+    private String msg;
+
+    private T data;
+
+    @lombok.Data
+    public class Data {
+
+        public List<MultiPaymentRespDto> queryList;
+
+    }
+}
\ No newline at end of file

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

@@ -68,7 +68,7 @@ public interface Orderservice {
     /**
      * 支付取消删除订单
      */
-    BaseResponse deleteOrderById(DeleteOrderVo deleteOrderVo);
+//    BaseResponse deleteOrderById(DeleteOrderVo deleteOrderVo);
 
     /**
      * 订单申请退款

order-application-service/src/main/java/cn/freemud/service/thirdparty/ComPayClient.java

@@ -14,6 +14,8 @@
 package cn.freemud.service.thirdparty;
 
 import cn.freemud.entities.dto.pay.CombPayResponse;
+import cn.freemud.entities.dto.pay.MultiQueryRequest;
+import cn.freemud.entities.dto.pay.MultiQueryRespDto;
 import com.freemud.sdk.api.assortment.order.request.payment.CombPayRequest;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -26,11 +28,16 @@ import org.springframework.web.bind.annotation.RequestMapping;
 @RequestMapping(produces = {"application/json;charset=UTF-8"})
 public interface ComPayClient {
 
-    // TODO: 21-4-1 待合并
-
     /**
-     * 统一下单
+     * 混合支付统一下单
      */
     @PostMapping("/payment/application/pay")
     CombPayResponse combPay(@RequestBody CombPayRequest combPayRequest, @RequestHeader("partnerId") String partnerId);
+
+    /**
+     * 混合支付查询接口
+     */
+    @PostMapping("/payment/application/query")
+    MultiQueryRespDto<MultiQueryRespDto.Data>  paymentApplicationQuery(MultiQueryRequest multiQueryRequest, @RequestHeader("partnerId") Integer partnerId);
+
 }

order-management/src/main/java/cn/freemud/management/thirdparty/MulitiPaymentClient.java

@@ -27,7 +27,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 public interface MulitiPaymentClient {
 
     /**
-     * 统一活动查询接口
+     * 混合支付退款接口
      */
     @PostMapping("/payment/application/refund")
     MultiOrderRefundResponse paymentApplicationRefund(MultiOrderRefundRequest multiOrderRefundRequest, @RequestHeader("partnerId") String partnerId);