1元插件参数返回

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -24,6 +24,7 @@ import cn.freemud.entities.dto.order.CreateOrderProductDto;
 import cn.freemud.entities.dto.order.*;
 import cn.freemud.entities.dto.pay.CombPayResponse;
 import cn.freemud.entities.dto.pay.OrderPayResponse;
+import cn.freemud.entities.dto.pay.UnifiedOrderCom;
 import cn.freemud.entities.dto.promotion.OrderBeanRequest;
 import cn.freemud.entities.dto.promotion.ShoppingCartGoodsResponse;
 import cn.freemud.entities.dto.shoppingCart.ActivityDiscountsDto;
@@ -3238,13 +3239,21 @@ public class OrderAdapter {
     }
 
     public UnifiedOrderRequest convent2UnifiedOrderRequest(OrderBeanV1 orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId) {
-        return convent2UnifiedOrderRequest(orderBean, paymentRequest, amount, cardAmount, transId, null);
+        return convent2UnifiedOrderRequest(new UnifiedOrderCom(orderBean, paymentRequest, amount, cardAmount, transId, null));
     }
 
     /**
      * 支付信息转换
      */
-    public UnifiedOrderRequest convent2UnifiedOrderRequest(OrderBeanV1 orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId, String partnerPayOvertime) {
+    public UnifiedOrderRequest convent2UnifiedOrderRequest(UnifiedOrderCom com) {
+        OrderBeanV1 orderBean = com.getOrderBean();
+        PaymentRequest paymentRequest =com.getPaymentRequest();
+        Long amount = com.getAmount();
+        Integer cardAmount = com.getCardAmount();
+        String transId =com.getTransId();
+        String partnerPayOvertime = com.getPartnerPayOvertime();
+
+
         UnifiedOrderRequest orderPayDto = new UnifiedOrderRequest();
         orderPayDto.setPartnerId(orderBean.getCompanyId());
         orderPayDto.setBody(paymentRequest.getPrincipalName());
@@ -3252,7 +3261,7 @@ public class OrderAdapter {
         orderPayDto.setStoreId(orderBean.getShopId());
         orderPayDto.setTransId(transId);
         orderPayDto.setOpenId(paymentRequest.getOpenId());
-        String businessDate = com.freemud.application.sdk.api.util.DateUtil.convert2String(new Date(), "yyyyMMdd");
+        String businessDate = DateUtil.convert2String(new Date(), "yyyyMMdd");
         orderPayDto.setBusinessDate(businessDate);
         orderPayDto.setAmount(amount);
         orderPayDto.setUndisAmount(1L);
@@ -3327,7 +3336,7 @@ public class OrderAdapter {
      *
      * @return
      */
-    private String getFoodOrderType(Integer orderType) {
+    public String getFoodOrderType(Integer orderType) {
         //1=外卖 4=自提，5=堂食
         //qr_order（店内扫码点餐）,pre_order（预点到店自提）,home_delivery （外送到家）
         String foodOrderType;

order-application-service/src/main/java/cn/freemud/adapter/PointsMallOrderAdapter.java

@@ -3,7 +3,7 @@ package cn.freemud.adapter;
 import cn.freemud.base.util.DateUtil;
 import cn.freemud.entities.Active;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
-import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
 import cn.freemud.entities.dto.pay.PayOrderDto;
 import cn.freemud.entities.dto.pay.PayProductDto;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
@@ -295,7 +295,7 @@ public class PointsMallOrderAdapter {
         return userScoreRequest;
     }
 
-    public void convent2CreateOrderResponseVo(CreateOrderResponseVo createOrderResponseVo, String appId, FacePayResponseDto response){
+    public void convent2CreateOrderResponseVo(CreateOrderResponseVo createOrderResponseVo, String appId, UnifiedPayResponseDto response){
         createOrderResponseVo.setWxappId(appId);
         createOrderResponseVo.setFmId(response.getFmId());
         createOrderResponseVo.setPaySuccess(false);

order-application-service/src/main/java/cn/freemud/entities/db/OpenPlatformPartnerPaymentAuth.java

+package cn.freemud.entities.db;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.util.Date;
+
+@Data
+@Table(name = "open_platform_partner_payment_auth")
+public class OpenPlatformPartnerPaymentAuth {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    /**
+     * 服务商在微信公众平台申请 appid
+     */
+    @Column(name = "sp_appid")
+    private String appId;
+
+    /**
+     * 微信支付分配的服务商商户
+     */
+    @Column(name = "sp_mchid")
+    private String spMchid;
+
+    /**
+     * 微信机构商户号
+     */
+    @Column(name = "unit_mchid")
+    private String unitMchid;
+
+    /**
+     * 创建时间
+     */
+    @Column(name = "gmt_created")
+    private Date gmtCreated;
+
+    /**
+     * 修改时间
+     */
+    @Column(name = "gmt_modified")
+    private Date gmtModified;
+}
\ No newline at end of file

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

@@ -71,4 +71,7 @@ public class CreatePrepayRequestDto {
     private String channel;
 
     private String sessionId;
+
+    //一元捐插件开通传 1=1元捐 2=……
+    private Integer plugIn;
 }

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

@@ -8,7 +8,7 @@ import java.util.List;
  * All rights Reserved, Designed By www.freemud.cn
  *
  * @version V1.0
- * @Title: FacePayResponseDto
+ * @Title: UnifiedPayResponseDto
  * @Package cn.freemud.entities.dto.order
  * @Description:
  * @author: ping1.wu

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

@@ -6,7 +6,7 @@ import lombok.Data;
  * All rights Reserved, Designed By www.freemud.cn
  *
  * @version V1.0
- * @Title: FacePayResponseDto
+ * @Title: UnifiedPayResponseDto
  * @Package cn.freemud.entities.dto.order
  * @Description:
  * @author: ping1.wu
@@ -15,7 +15,7 @@ import lombok.Data;
  * 注意：本内容仅限于上海非码科技内部传阅，禁止外泄以及用于其他的商业目
  */
 @Data
-public class FacePayResponseDto {
+public class UnifiedPayResponseDto {
 
     private Integer resultCode;
     private String resultMsg;
@@ -34,4 +34,6 @@ public class FacePayResponseDto {
 //    private String payCode;
     private String payOrder;
 
+    private String endTransId;
+
 }

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

@@ -61,6 +61,9 @@ public class CombPayResponse {
         @ApiModelProperty(value = "间联单号")
         private String transId;
 
+        //商户单号
+        private String endTransTradeNo;
+
         //储值卡类型：0一次性卡（礼品卡），3重复使用卡（储值卡）")
         private Integer cardType;
 

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

@@ -89,6 +89,9 @@ public class OrderPayResponse {
      */
     private String thirdOrderToken;
 
+    //商户订单号
+    private String endTransId;
+
     @NoArgsConstructor
     @Data
     public static class PayOrderBean {

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

+package cn.freemud.entities.dto.pay;
+
+import com.freemud.application.sdk.api.ordercenter.entities.v1.OrderBeanV1;
+import com.freemud.application.sdk.api.ordercenter.response.orderInfo.OrderInfoReqs;
+import com.freemud.sdk.api.assortment.order.request.order.PaymentRequest;
+import lombok.Data;
+
+@Data
+public class UnifiedOrderCom {
+
+    private OrderInfoReqs orderInfo;
+    private String openId;
+    private Integer cashPrice;
+    private Long clientCode;
+    private String payTimeOutTime;
+
+
+    private OrderBeanV1 orderBean;
+    private PaymentRequest paymentRequest;
+    private Long amount;
+    private Integer cardAmount;
+    private String transId;
+    private String partnerPayOvertime;
+
+
+    public UnifiedOrderCom() {
+    }
+
+    public UnifiedOrderCom(OrderBeanV1 orderBean, PaymentRequest paymentRequest, Long amount, Integer cardAmount, String transId, String partnerPayOvertime) {
+        this.orderBean = orderBean;
+        this.paymentRequest = paymentRequest;
+        this.amount = amount;
+        this.cardAmount = cardAmount;
+        this.transId = transId;
+        this.partnerPayOvertime = partnerPayOvertime;
+    }
+}

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

@@ -13,6 +13,7 @@
 package cn.freemud.entities.vo;
 
 import cn.freemud.entities.ttpay.OrderInfo;
+import cn.freemud.entities.vo.order.PlugInParameter;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -68,4 +69,6 @@ public class CreateOrderResponseVo {
      */
     private OrderInfo orderInfo;
 
+    private PlugInParameter plugInParameter;
+
 }

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

@@ -496,4 +496,7 @@ public class CreateOrderVo {
      * 收货名姓名
      */
     private String contactsName;
+
+    //一元捐插件开通传 1=1元捐 2=……
+    private Integer plugIn;
 }

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

+package cn.freemud.entities.vo.order;
+
+import lombok.Data;
+
+@Data
+public class PlugInParameter {
+
+    private String mchCode;
+
+    private String subMchCode;
+
+    private String outTradeNo;
+
+}

order-application-service/src/main/java/cn/freemud/manager/OpenPlatformPaymentConfigManager.java

 package cn.freemud.manager;
 
+import cn.freemud.entities.db.OpenPlatformPartnerPaymentAuth;
 import cn.freemud.entities.db.OpenPlatformPaymentConfig;
+import cn.freemud.manager.dao.OpenPlatformPartnerPaymentAuthDao;
 import cn.freemud.manager.dao.OpenPlatformPaymentConfigDao;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 支付配置表manager
  * @author zhenghuan.yang
@@ -16,6 +20,9 @@ public class OpenPlatformPaymentConfigManager {
     @Autowired
     private OpenPlatformPaymentConfigDao openPlatformPaymentConfigDao;
 
+    @Autowired
+    private OpenPlatformPartnerPaymentAuthDao openPlatformPartnerPaymentAuthDao;
+
     public OpenPlatformPaymentConfig selectPaymentConfigByWxAppId(String wxAppId) {
         OpenPlatformPaymentConfig config = new OpenPlatformPaymentConfig();
         config.setWxAppId(wxAppId);
@@ -25,4 +32,10 @@ public class OpenPlatformPaymentConfigManager {
         return openPlatformPaymentConfigDao.insert(config);
     }
 
+    public List<OpenPlatformPartnerPaymentAuth> selectPaymentAuthByAppId(String appId) {
+        OpenPlatformPartnerPaymentAuth pars = new OpenPlatformPartnerPaymentAuth();
+        pars.setAppId(appId);
+        return openPlatformPartnerPaymentAuthDao.select(pars);
+    }
+
 }

order-application-service/src/main/java/cn/freemud/manager/dao/OpenPlatformPartnerPaymentAuthDao.java

+package cn.freemud.manager.dao;
+
+import cn.freemud.comm.druid.MyMapper;
+import cn.freemud.entities.db.OpenPlatformPartnerPaymentAuth;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface OpenPlatformPartnerPaymentAuthDao extends MyMapper<OpenPlatformPartnerPaymentAuth> {
+}
\ No newline at end of file

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

@@ -332,6 +332,7 @@ public class OrderServiceImpl implements Orderservice {
         CreateOrderOperateDto createOrderOperateDto = (CreateOrderOperateDto) createOrderOperateDtoResponse.getResult();
         //创建支付
         CreatePrepayRequestDto createPrepayRequestDto = orderAdapter.convertToCreatePrepayRequestDto(userLoginInfoDto, createOrderVo, createOrderOperateDto, extInfo);
+        createPrepayRequestDto.setPlugIn(createOrderVo.getPlugIn());
         return ResponseUtil.success(payServiceImpl.createPrepayOrder(createPrepayRequestDto));
     }
 

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

@@ -10,7 +10,7 @@ import cn.freemud.entities.Active;
 import cn.freemud.entities.dto.BatchQueryActivityInfoRequestDto;
 import cn.freemud.entities.dto.BatchQueryActivityInfoResponseDto;
 import cn.freemud.entities.dto.delivery.WeixinDeliveryAddressDto;
-import cn.freemud.entities.dto.order.FacePayResponseDto;
+import cn.freemud.entities.dto.order.UnifiedPayResponseDto;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
 import cn.freemud.entities.dto.product.pointsmall.*;
 import cn.freemud.entities.dto.user.CustomerPropertyBaseResponse;
@@ -68,7 +68,6 @@ import org.springframework.stereotype.Component;
 
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.stream.Collectors;
 
 @Component
 public class PointsMallOrderServiceImpl implements PointsMallOrderService {
@@ -199,7 +198,7 @@ public class PointsMallOrderServiceImpl implements PointsMallOrderService {
         CreateOrderResponseVo createOrderResponseVo = new CreateOrderResponseVo();
         createOrderResponseVo.setOid(orderCode);
         //线上现金支付，创建预支付订单，唤起支付
-        com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> response = null;
+        com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> response = null;
         if (!Objects.equals(ExchangeTypeEnum.TYPE_1.getCode(), exchangeType) && cashPrice != null && cashPrice > 0) {
             Long payClientCode = Long.parseLong(wxAppStore.getClientCode());
             UnifiedOrderRequestDto requestDto = pointsMallOrderAdapter.convert2UnifiedOrderRequestDto(result, openId, cashPrice,

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

@@ -3,7 +3,7 @@ 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.order.UnifiedPayResponseDto;
 import cn.freemud.entities.dto.order.InvoiceCreateResponse;
 import cn.freemud.entities.dto.pay.InvoiceCreateRequest;
 import cn.freemud.entities.dto.pay.UnifiedOrderRequestDto;
@@ -36,7 +36,7 @@ public interface PaymentNewClient {
      */
     @LogIgnoreFeign(logMessage="facePay",statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("paymentcenter/facePay")
-    com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
+    com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> facePay(@RequestBody FacePayRequestDto orderPayDto);
 
 
     /**
@@ -44,7 +44,7 @@ public interface PaymentNewClient {
      */
     @LogIgnoreFeign(logMessage="unifiedOrder",statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("paymentcenter/unifiedOrder")
-    com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> unifiedOrder(@RequestBody UnifiedOrderRequestDto requestDto);
+    com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> unifiedOrder(@RequestBody UnifiedOrderRequestDto requestDto);
 
     @LogIgnoreFeign(logMessage="refundQuery")
     @PostMapping("paymentcenter/refundQuery")
@@ -61,7 +61,7 @@ public interface PaymentNewClient {
     //线下付，储值卡/礼品卡支付
     @LogIgnoreFeign(logMessage="codePay",statusCodeFieldName= ResponseCodeKeyConstant.STATUS_CODE)
     @PostMapping("paymentcenter/codePay")
-    com.freemud.application.sdk.api.base.BaseResponse<FacePayResponseDto> codePay(@RequestBody FacePayRequestDto orderPayDto);
+    com.freemud.application.sdk.api.base.BaseResponse<UnifiedPayResponseDto> codePay(@RequestBody FacePayRequestDto orderPayDto);
 
 
 }

order-application-service/src/main/resources/mapper/OpenPlatformPartnerPaymentAuthDao.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
+<mapper namespace="cn.freemud.manager.dao.OpenPlatformPartnerPaymentAuthDao" >
+  <resultMap id="BaseResultMap" type="cn.freemud.entities.db.OpenPlatformPartnerPaymentAuth" >
+    <id column="id" jdbcType="BIGINT" property="id" />
+    <result column="sp_appid" jdbcType="VARCHAR" property="appId" />
+    <result column="sp_mchid" jdbcType="VARCHAR" property="spMchid" />
+    <result column="unit_mchid" jdbcType="VARCHAR" property="unitMchid" />
+    <result column="gmt_created" jdbcType="TIMESTAMP" property="gmtCreated" />
+    <result column="gmt_modified" jdbcType="TIMESTAMP" property="gmtModified" />
+  </resultMap>
+
+</mapper>
\ No newline at end of file