积分商城二期现金支付

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

 package cn.freemud.entities.dto.order;
 
+import cn.freemud.entities.dto.pay.PayOrderDto;
 import lombok.Data;
 
 /**
@@ -27,4 +28,11 @@ public class FacePayResponseDto {
     private Integer merchantCoupon;
     private Integer platformCoupon;
 
+//    private Integer resultCode;
+//    private String resultMsg;
+    private String transId;
+//    private String fmId;
+//    private String payCode;
+    private PayOrderDto payOrder;
+
 }

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

+package cn.freemud.entities.dto.pay;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class PayOrderDto {
+
+    private String appid;
+
+    @JsonProperty("package")
+    private String packageX;
+
+    @JsonProperty("nonce_str")
+    private String nonceStr;
+
+    private String sign;
+
+    private String timestamp;
+
+    private String signType;
+
+    private String aliPayOrder;
+
+    private String paySign;
+
+    private String bizContent;
+
+    private String thirdPartTradeNo;
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+@Data
+public class PayProductDto {
+
+    private String id;
+    private Integer quantity;
+    private Long price;
+    private String name;
+
+}

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

+package cn.freemud.entities.dto.pay;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class UnifiedOrderRequestDto {
+
+    /**
+     *      * 	{"amount":1800,"body":"蜜雪冰城900507店","businessDate":"20210831","clientCode":130465,"foodOrderType":"pre_order",
+     *      * 	"notifyUrl":"http://open-store-order-application-service.open-store.svc:9212/order/newPaySuccessCallback","openId":"2088332790804910",
+     *      * 	"operatorId":"1","partnerId":2080,"payTimeOutTime":"25","products":[{"id":"209430924058928948","name":"鲜橙益菌多","price":900,"quantity":1},
+     *      * 	{"id":"209516210115815203","name":"芝士奶盖红茶","price":900,"quantity":1}],"stationId":"1","storeId":"900507","transId":"22057814343976884800004",
+     *      * 	"ver":"2","vipAmount":0}
+     */
+
+
+    private String ver = "2";
+    private Integer reqtype;
+    private String unifyid;
+    private String partnerId;
+    private String storeId;
+    private String stationId = "1";
+    private String operatorId = "1";
+    private String transId;
+    private String openId;
+    private String businessDate;
+    private Long clientCode;
+    private Long amount;
+    private Long undisAmount;
+    private String goodsTag;
+    private List<PayProductDto> products;
+    private String body;
+    private String payCode;
+    private String notifyUrl;
+    private Long vipAmount = 0L;
+    private String foodOrderType;
+    private Integer invoiceFlag;
+    private Map<String, String> extendParams;
+    private String divideDetail;
+    private String payTimeOutTime;
+    private Long merchantDiscount;
+
+}

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

 package cn.freemud.service.thirdparty;
 
 import cn.freemud.annotations.LogIgnoreFeign;
+import cn.freemud.constant.ResponseCodeKeyConstant;
 import cn.freemud.entities.dto.order.FacePayRequestDto;
 import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -29,8 +31,16 @@ public interface PaymentNewClient {
     /**
      * 扫脸支付
      */
-    @LogIgnoreFeign(logMessage="facePay")
+    @LogIgnoreFeign(logMessage="facePay",statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("paymentcenter/facePay")
     com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
 
+
+    /**
+     * 创建预支付订单，唤起支付
+     */
+    @LogIgnoreFeign(logMessage="unifiedOrder",statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE)
+    @PostMapping("paymentcenter/unifiedOrder")
+    com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> unifiedOrder(@RequestBody UnifiedOrderRequestDto requestDto);
+
 }