第三方支付

src/main/java/com/poteviohealth/ym/ipos/controller/feign/IposFeignController.java

@@ -7,11 +7,13 @@ import com.poteviohealth.cgp.common.integrated.order.model.PayInfoAppOutDTO;
 import com.poteviohealth.cgp.common.integrated.order.model.RefundReceive;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
 import com.poteviohealth.cgp.common.utils.CgpTool;
+import com.poteviohealth.cgp.common.utils.DateUtils;
 import com.poteviohealth.ym.ipos.model.payment.PaymentRecords;
 import com.poteviohealth.ym.ipos.service.IPaymentRecordsService;
 import com.poteviohealth.ym.ipos.service.IPaymentService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.annotation.Resource;
+import java.util.Date;
 
 /**
  * 第三方支付
@@ -45,6 +48,7 @@ public class IposFeignController extends BaseFeignController {
         pr.setOpenid(payBefor.getOpenid());
         pr.setAppId(payBefor.getAppId());
         pr.setOperatorId(payBefor.getOperatorId());
+        pr.setPlanSplitDate(DateFormatUtils.format(DateUtils.caculDays(new Date(),17),"yyyyMMdd"));
         paymentRecordsService.save(pr);
 
         return paymentService.unifiedOrder(pr);

src/main/java/com/poteviohealth/ym/ipos/model/payment/PaymentRecords.java

@@ -50,6 +50,9 @@ public class PaymentRecords extends BaseEntity {
     @ApiModelProperty(value="终端号")
     private String posId;
 
+    @ApiModelProperty(value="门店号")
+    private String storeId;
+
     /**
      * 502：支付宝支付
      * 503：微信支付

src/main/java/com/poteviohealth/ym/ipos/service/impl/PaymentServiceImpl.java

@@ -1,5 +1,6 @@
 package com.poteviohealth.ym.ipos.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.poteviohealth.cgp.common.filter.TokenContext;
 import com.poteviohealth.cgp.common.integrated.order.OrderFeignClient;
@@ -7,7 +8,6 @@ import com.poteviohealth.cgp.common.integrated.order.model.PayInfoAppOutDTO;
 import com.poteviohealth.cgp.common.integrated.order.model.PayReceive;
 import com.poteviohealth.cgp.common.integrated.order.model.RefundReceive;
 import com.poteviohealth.cgp.common.model.VaultsResponse;
-import com.poteviohealth.cgp.common.utils.DateUtils;
 import com.poteviohealth.ym.ipos.model.payment.*;
 import com.poteviohealth.ym.ipos.model.payment.back.*;
 import com.poteviohealth.ym.ipos.model.payment.detail.*;
@@ -16,12 +16,10 @@ import com.poteviohealth.ym.ipos.service.IPaymentRecordsService;
 import com.poteviohealth.ym.ipos.service.IPaymentService;
 import com.poteviohealth.ym.ipos.utils.YmUtil;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.Date;
 
 /**
  * 支付
@@ -101,6 +99,7 @@ public class PaymentServiceImpl implements IPaymentService {
 
     @Override
     public VaultsResponse barcodeReverse(RefundReceive refundReceive) {
+        log.info("refundReceive==="+ JSON.toJSONString(refundReceive));
         PayReverse payReverse = new PayReverse();
         payReverse.setPos_id(code);
         payReverse.setStore_id(refundReceive.getOperatorId().toString());
@@ -165,7 +164,7 @@ public class PaymentServiceImpl implements IPaymentService {
         detail.setTx_amt(records.getTxAmt());
         detail.setNotify_url(notifyUrl);
         ExtendParams extendParams = new ExtendParams();
-        extendParams.setPlan_split_date(DateFormatUtils.format(DateUtils.caculDays(new Date(),17),"yyyyMMdd"));
+        extendParams.setPlan_split_date(records.getPlanSplitDate());
         detail.setExtend_params(extendParams);
         payOrder.setUnifiedorder_request(detail);
         PayBack back = null;
@@ -203,6 +202,7 @@ public class PaymentServiceImpl implements IPaymentService {
                 pr.setEndTime(payNotification.getEnd_time());
                 pr.setSource(payNotification.getSource());
                 pr.setPosId(payNotification.getPos_id());
+                pr.setStoreId(payNotification.getStore_id());
                 pr.setPayType(payNotification.getPay_type());
                 pr.setTransType(payNotification.getTrans_type());
                 pr.setTradeNo(payNotification.getTrade_no());