Merge branches 'develop' and 'feature/20191225_扫脸支付_wuping' of…

Merge branches 'develop' and 'feature/20191225_扫脸支付_wuping' of http://gitlab.freemud.com/order-group-application/order-group into develop

# Conflicts:
#	order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java
#	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

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

@@ -76,6 +76,15 @@ public class OrderController {
     }
 
     /**
+     * 扫脸支付下单
+     */
+    @ApiAnnotation(logMessage = "scanFaceCreateOrder")
+    @PostMapping("/scanFaceCreateOrder")
+    public BaseResponse scanFaceCreateOrder(@Validated @LogParams @RequestBody CreateOrderVo createOrderVo) {
+        return orderservice.scanFaceCreateOrder(createOrderVo);
+    }
+
+    /**
      * 订单支付成功后通知
      */
     @ApiAnnotation(logMessage = "paySuccessCallback")

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

+package cn.freemud.entities.dto.order;
+
+import com.freemud.sdk.api.assortment.order.response.order.QueryOrdersResponse;
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: CreateOrderOperateDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 18:00
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class CreateOrderOperateDto {
+
+    //支付总金额（父子订单时包括购买会员卡订单金额）
+    private Long totalAmount;
+    //会员卡支付金额
+    private Integer cardAmount;
+    //父子订单父订单
+    private QueryOrdersResponse.DataBean.OrderBean fatherOrderBean;
+    //父子订单商品订单
+    private QueryOrdersResponse.DataBean.OrderBean productOrderBean;
+
+}

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

+package cn.freemud.entities.dto.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: FacePayRequestDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:28
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class FacePayRequestDto {
+
+    private String ver;
+    private String body;
+    private String cardCode;
+    private String divideDetail;
+    private String partnerId;
+    private String storeId;
+    private String frontTransId;
+    private String stationId;
+    private String operatorId;
+    private String transId;
+    private String businessDate;
+    private Long amount;
+    private Long clientCode;
+    private String code;
+    private Long undisAmount;
+//    private List<CodePayRequest.PayProduct> products;
+
+}

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

+package cn.freemud.entities.dto.order;
+
+import lombok.Data;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: FacePayResponseDto
+ * @Package cn.freemud.entities.dto.order
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:23
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@Data
+public class FacePayResponseDto {
+
+    private Integer resultCode;
+    private String resultMsg;
+    private String fmId;
+    private String payTransId;
+    private String payCode;
+    private String userId;
+    private String originalChannel;
+    private Integer merchantCoupon;
+    private Integer platformCoupon;
+
+}

order-application-service/src/main/java/cn/freemud/entities/vo/CreateOrderVo.java

@@ -172,16 +172,21 @@ public class CreateOrderVo {
     private String cardCode;
 
     /**
-     * 渠道类型 OrderChannelType 
+     * 渠道类型 OrderChannelType
      */
     private String channelType;
-    
+
     /**
-     * 微信配送地址信息 
+     * 微信配送地址信息
      */
     private WeixinDeliveryAddressDto weixinDeliveryAddress;
 
 
+    /**
+     * 扫脸支付使用
+     */
+    private String faceCode;
+
     @Data
     public static class PremiumExchangeActivity {
         @NotNull(message = "activityCode 不能为空")

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

@@ -22,6 +22,8 @@ public interface Orderservice {
      */
     BaseResponse createOrderNew(CreateOrderVo createOrderVo);
 
+    BaseResponse scanFaceCreateOrder(CreateOrderVo createOrderVo);
+
     /**
      * 支付成功后回调通知
      */

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

+package cn.freemud.service.thirdparty;
+
+import cn.freemud.entities.dto.order.FacePayRequestDto;
+import cn.freemud.entities.dto.order.FacePayResponseDto;
+import org.springframework.cloud.netflix.feign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * All rights Reserved, Designed By www.freemud.cn
+ *
+ * @version V1.0
+ * @Title: PaymentNewClient
+ * @Package cn.freemud.service.thirdparty
+ * @Description:
+ * @author: ping1.wu
+ * @date: 2019/12/25 19:09
+ * @Copyright: 2019 www.freemud.cn Inc. All rights reserved.
+ * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
+ */
+@FeignClient(name = "payment-service-new",url="${payment.new.baseUrl}")
+@RequestMapping(produces = {"application/json;charset=UTF-8"})
+public interface PaymentNewClient {
+
+    /**
+     * 扫脸支付
+     */
+    @PostMapping("paymentcenter/facePay")
+    com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
+
+}