|
|
@@ -1,13 +1,6 @@
|
|
|
package com.fs.hisStore.service.impl;
|
|
|
|
|
|
|
|
|
-import java.math.BigDecimal;
|
|
|
-
|
|
|
-import java.time.LocalDate;
|
|
|
-import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.*;
|
|
|
-
|
|
|
-
|
|
|
import cn.binarywang.wx.miniapp.api.WxMaService;
|
|
|
import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
@@ -40,24 +33,27 @@ import com.fs.his.service.IFsUserService;
|
|
|
import com.fs.his.service.IFsUserWxService;
|
|
|
import com.fs.his.utils.ConfigUtil;
|
|
|
import com.fs.hisStore.config.StoreConfig;
|
|
|
+import com.fs.hisStore.domain.FsStorePaymentScrm;
|
|
|
+import com.fs.hisStore.domain.FsUserScrm;
|
|
|
import com.fs.hisStore.enums.StatTypeEnum;
|
|
|
import com.fs.hisStore.enums.SysConfigEnum;
|
|
|
+import com.fs.hisStore.mapper.FsStorePaymentScrmMapper;
|
|
|
import com.fs.hisStore.param.*;
|
|
|
+import com.fs.hisStore.service.IFsStorePaymentScrmService;
|
|
|
+import com.fs.hisStore.service.IFsUserScrmService;
|
|
|
+import com.fs.hisStore.vo.FsStorePaymentStatisticsVO;
|
|
|
+import com.fs.hisStore.vo.FsStorePaymentVO;
|
|
|
import com.fs.hisStore.vo.FsStoreScanPaymentStatDetailsVo;
|
|
|
import com.fs.hisStore.vo.FsStoreScanPaymentStatVo;
|
|
|
import com.fs.huifuPay.domain.HuiFuCreateOrder;
|
|
|
import com.fs.huifuPay.domain.HuifuCreateOrderResult;
|
|
|
import com.fs.huifuPay.service.HuiFuService;
|
|
|
import com.fs.pay.pay.dto.WxJspayDTO;
|
|
|
-import com.fs.hisStore.vo.FsStorePaymentStatisticsVO;
|
|
|
+import com.fs.pay.service.IPayService;
|
|
|
import com.fs.system.oss.CloudStorageService;
|
|
|
import com.fs.system.oss.OSSFactory;
|
|
|
import com.fs.system.service.ISysConfigService;
|
|
|
import com.fs.wx.miniapp.config.WxMaProperties;
|
|
|
-import com.fs.hisStore.domain.FsUserScrm;
|
|
|
-import com.fs.hisStore.service.IFsUserScrmService;
|
|
|
-import com.fs.hisStore.vo.FsStorePaymentVO;
|
|
|
-import com.fs.pay.service.IPayService;
|
|
|
import com.fs.ybPay.domain.CreateWxOrderResult;
|
|
|
import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
|
|
|
import com.github.binarywang.wxpay.bean.notify.WxPayNotifyResponse;
|
|
|
@@ -75,12 +71,16 @@ import org.slf4j.LoggerFactory;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
-import com.fs.hisStore.mapper.FsStorePaymentScrmMapper;
|
|
|
-import com.fs.hisStore.domain.FsStorePaymentScrm;
|
|
|
-import com.fs.hisStore.service.IFsStorePaymentScrmService;
|
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.time.LocalDate;
|
|
|
+import java.time.format.DateTimeFormatter;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.Date;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
|
|
|
/**
|
|
|
* 支付明细Service业务层处理
|
|
|
@@ -885,6 +885,7 @@ public class FsStorePaymentScrmServiceImpl implements IFsStorePaymentScrmService
|
|
|
storePayment.setPayMoney(param.getPayMoney());
|
|
|
storePayment.setCreateTime(new Date());
|
|
|
storePayment.setPayTypeCode("weixin");
|
|
|
+ storePayment.setPayMode("hf");
|
|
|
storePayment.setBusinessType(1);
|
|
|
storePayment.setRemark("商城收款订单支付");
|
|
|
storePayment.setOpenId(user.getMaOpenId());
|