Skip to content

GitLab

Q
qk_backend
Commit 11f8b003 authored by shiyu's avatar shiyu
Browse files
Options

预支付接口

parent e290676d
Hide whitespace changes
Inline Side-by-side
Showing with 364 additions and 49 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysOpenShopApplyOrderController.java 0 → 100644
View file @ 11f8b003
package com.wwdz.ch.admin.controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@RestController
@RequestMapping("/admin/openShopApplyOrder")
public class SysOpenShopApplyOrderController {
}
ch-core/src/main/java/com/wwdz/ch/core/consts/CommonEnum.java
View file @ 11f8b003
......@@ -34,6 +34,38 @@ public class CommonEnum {
}
public enum StateEnum {
INVALID(0, "无效"),
VALID(1, "有效"),
;
private int code;
private String des;
StateEnum(int code, String des) {
this.code = code;
this.des = des;
}
public static String getNameByCode(int code) {
for (StateEnum stateEnum : StateEnum.values()) {
if (code == stateEnum.getCode()) {
return stateEnum.getDes();
}
}
return null;
}
public int getCode() {
return code;
}
public String getDes() {
return des;
}
}
public enum SourceTypeEnum {
SYSTEM_GET(1, "系统获取"),
......
ch-core/src/main/java/com/wwdz/ch/core/consts/OpenShopApplyOrderEnum.java
View file @ 11f8b003
......@@ -6,6 +6,7 @@ public class OpenShopApplyOrderEnum {
* 申请开店订单状态
*/
public enum StateEnum {
NO_APPLY(-1, "尚未申请"),
PRE_PAY(0, "待付款"),
PRE_AUDIT(10, "待审核"),
PASSED(20, "审核通过"),
......
ch-core/src/main/java/com/wwdz/ch/core/entity/openShop/OpenShopApplyOrderVo.java 0 → 100644
View file @ 11f8b003
package com.wwdz.ch.core.entity.openShop;
import com.xxdxxs.entity.Entity;
import lombok.Data;
import java.util.Date;
@Data
public class OpenShopApplyOrderVo implements Entity {
/**
* 用户id
*/
private Long userId;
private String userName;
/**
* 藏家粉丝数
*/
private Long fansNum;
/**
* 上传商品的数量
*/
private Long uploadItemNum;
/**
* 申请时间
*/
private Date createTime;
private String userOpenId;
/**
* 身份证正面
*/
private String idCardFrontImage;
/**
* 身份证背面
*/
private String idCardBackImage;
/**
* 卡号
*/
private String cardId;
/**
* 持卡人名称
*/
private String name;
/**
* 开户行名称
*/
private String bankName;
/**
* 开店金额
*/
private String openShopAmount;
/**
* 申请单状态
*/
private Integer state;
private String stateName;
}
ch-dao/src/main/java/com/wwdz/ch/db/dao/CollectorWhiteListDao.java
View file @ 11f8b003
......@@ -15,6 +15,8 @@ public interface CollectorWhiteListDao {
CollectorWhiteList findById(long collectorId);
CollectorWhiteList findByUserIdWithoutValid(long collectorId);
List<CollectorWhiteList> findShowList();
}
ch-dao/src/main/java/com/wwdz/ch/db/dao/openShop/OpenShopApplyOrderDao.java
View file @ 11f8b003
......@@ -14,4 +14,7 @@ public interface OpenShopApplyOrderDao {
boolean updateState(String orderId, int state);
OpenShopApplyOrder findByUserId(long userId);
}
ch-dao/src/main/java/com/wwdz/ch/db/impl/CollectorWhiteListDaoImpl.java
View file @ 11f8b003
......@@ -56,6 +56,14 @@ public class CollectorWhiteListDaoImpl implements CollectorWhiteListDao {
return collectorWhiteListMapper.selectOneByExample(example);
}
@Override
public CollectorWhiteList findByUserIdWithoutValid(long collectorId) {
CollectorWhiteListExample example = new CollectorWhiteListExample();
CollectorWhiteListExample.Criteria criteria = example.createCriteria();
criteria.andCollectorIdEqualTo(collectorId);
return collectorWhiteListMapper.selectOneByExample(example);
}
@Override
public List<CollectorWhiteList> findShowList() {
CollectorWhiteListExample example = new CollectorWhiteListExample();
......
ch-dao/src/main/java/com/wwdz/ch/db/impl/openShop/OpenShopApplyOrderDaoImpl.java
View file @ 11f8b003
......@@ -45,4 +45,14 @@ public class OpenShopApplyOrderDaoImpl implements OpenShopApplyOrderDao {
openShopApplyOrder.setUpdateTime(new Date());
return openShopApplyOrderMapper.updateByExampleSelective(openShopApplyOrder, example) > 0;
}
@Override
public OpenShopApplyOrder findByUserId(long userId) {
OpenShopApplyOrderExample example = new OpenShopApplyOrderExample();
OpenShopApplyOrderExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(userId);
example.setOrderByClause("create_time desc");
return openShopApplyOrderMapper.selectOneByExample(example);
}
}
ch-dao/src/main/java/com/wwdz/ch/db/impl/openShop/OpenShopCostRecordDaoImpl.java
View file @ 11f8b003
......@@ -28,6 +28,7 @@ public class OpenShopCostRecordDaoImpl implements OpenShopCostRecordDao {
OpenShopCostRecordExample.Criteria criteria = example.createCriteria();
JdbcHelper.ifPresent(openShopCostRecord.getOpenShopCostOrderId(), criteria :: andOpenShopCostOrderIdEqualTo);
JdbcHelper.ifPresent(openShopCostRecord.getUserId(), criteria :: andUserIdEqualTo);
openShopCostRecord.setUpdateTime(new Date());
return openShopCostRecordMapper.updateByExampleSelective(openShopCostRecord, example) > 0;
}
......
ch-dao/src/main/java/com/wwdz/ch/db/mapper/distribution/UserBankCardMapper.java
View file @ 11f8b003
......@@ -3,8 +3,11 @@ package com.wwdz.ch.db.mapper.distribution;
import com.wwdz.ch.db.domain.distribution.UserBankCard;
import com.wwdz.ch.db.domain.distribution.UserBankCardExample;
import java.util.List;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@Mapper
public interface UserBankCardMapper {
long countByExample(UserBankCardExample example);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/api/WxPayCallbackController.java
View file @ 11f8b003
......@@ -11,17 +11,23 @@ import com.wwdz.ch.core.api.wxpay.WxPayServiceApi;
import com.wwdz.ch.core.consts.*;
import com.wwdz.ch.core.notify.AliSmsSender;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.IdUtils;
import com.wwdz.ch.core.util.PriceUtil;
import com.wwdz.ch.core.util.RedisUtils;
import com.wwdz.ch.core.util.TimeUtil;
import com.wwdz.ch.db.dao.distribution.*;
import com.wwdz.ch.db.dao.openShop.GuaranteeMoneyRecordDao;
import com.wwdz.ch.db.dao.openShop.OpenShopCostRecordDao;
import com.wwdz.ch.db.domain.distribution.*;
import com.wwdz.ch.db.domain.openShop.GuaranteeMoneyRecord;
import com.wwdz.ch.db.domain.openShop.OpenShopCostRecord;
import com.wwdz.ch.db.dto.request.distribution.DistributionOrderRequestDto;
import com.wwdz.ch.core.entity.DistributionOrderNoticeMsg;
import com.wwdz.ch.core.entity.PayNoticeMsg;
import com.wwdz.ch.core.service.SendMsgService;
import com.wwdz.ch.db.dto.request.distribution.GroupPurchaseRecordRequestDto;
import com.wwdz.ch.wx.service.distribution.*;
import com.xxdxxs.utils.DateUtils;
import com.xxdxxs.utils.JsonUtils;
import com.xxdxxs.utils.StringUtils;
import org.slf4j.Logger;
......@@ -37,6 +43,11 @@ import javax.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
import java.time.Duration;
import java.time.Instant;
import java.time.LocalDateTime;
import java.time.temporal.ChronoUnit;
import java.time.temporal.TemporalUnit;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
......@@ -110,6 +121,12 @@ public class WxPayCallbackController {
@Autowired
GroupPurchaseRecordDao groupPurchaseRecordDao;
@Autowired
OpenShopCostRecordDao openShopCostRecordDao;
@Autowired
GuaranteeMoneyRecordDao guaranteeMoneyRecordDao;
@RequestMapping(value ="/getPayNotify")
public String payNotify(HttpServletRequest request) throws IOException {
logger.info("------------------ 收到微信支付回调通知 ------------------");
......@@ -151,53 +168,62 @@ public class WxPayCallbackController {
logger.error("验签失败 : {}", e);
return JsonUtils.from(returnMap);
}
//商户订单号，分销订单号
String distributionOrderId = transaction.getOutTradeNo();
//系统订单号(销售订单、开店费订单、质保金缴纳订单)
String systemOrderId = transaction.getOutTradeNo();
try {
//修改订单前，建议主动请求微信查询订单是否支付成功，防止恶意post
if (redisUtils.hasKey(distributionOrderId)) {
logger.info(">>>>>>>>>>> 分销单号【{}】, 正在被其它服务处理，当前不能操作 <<<<<<<<<<<<", distributionOrderId);
if (redisUtils.hasKey(systemOrderId)) {
logger.info(">>>>>>>>>>> 销售单号【{}】, 正在被其它服务处理，当前不能操作 <<<<<<<<<<<<", systemOrderId);
return JsonUtils.from(returnMap);
}
redisUtils.set(distributionOrderId, distributionOrderId);
redisUtils.set(systemOrderId, systemOrderId);
//调用微信查询订单接口查询订单当前状态
DistributionOrderRequestDto distributionOrderRequestDto = new DistributionOrderRequestDto();
distributionOrderRequestDto.setDistributionOrderId(distributionOrderId);
distributionOrderRequestDto.setDistributionOrderId(systemOrderId);
Result<Transaction> queryResult = wxPayServiceApi.queryOrderBytOutTradeNo(distributionOrderRequestDto);
//支付成功，修改订单状态
if (queryResult.getSuccess()) {
//查询系统中订单现在的状态，避免重复更新
DistributionOrder distributionOrder = distributionOrderDao.findById(distributionOrderId);
if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) {
//一口价处理逻辑
if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
Result updateResult = updateOrderStateAndInsertProfit(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
//竞拍订单处理
Result updateResult = handleAuctionOrder(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
//藏馆订单
Result updateResult = handleOrderOfCollector(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode()) {
//折扣订单
Result updateResult = handleOrderOfDiscount(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
//团购订单
Result updateResult = handleOrderOfGroupPurchase(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
if (systemOrderId.startsWith(CommConsts.OPEN_SHOP_COST_ORDER_PREFIX)) {
//开店费缴纳订单
handleOrderOfOpenShop(transaction);
} else if (systemOrderId.startsWith(CommConsts.GUARANTEE_MONEY_ORDER_PREFIX)) {
//质保金缴纳订单
handleOrderOfGuaranteeMoney(transaction);
} else if (systemOrderId.startsWith(CommConsts.DISTRIBUTION_ORDER_PREFIX)) {
//查询系统中订单现在的状态，避免重复更新
DistributionOrder distributionOrder = distributionOrderDao.findById(systemOrderId);
if (distributionOrder.getState() == DistributionEnum.DistributionOrderStateEnum.PRE_PAY.getCode()) {
//一口价处理逻辑
if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.FIXED_PRICE.getCode()) {
Result updateResult = updateOrderStateAndInsertProfit(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.AUCTION.getCode()) {
//竞拍订单处理
Result updateResult = handleAuctionOrder(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
//藏馆订单
Result updateResult = handleOrderOfCollector(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.DISCOUNT.getCode()) {
//折扣订单
Result updateResult = handleOrderOfDiscount(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
} else if (distributionOrder.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
//团购订单
Result updateResult = handleOrderOfGroupPurchase(transaction);
if (!updateResult.getSuccess()) {
return JsonUtils.from(returnMap);
}
}
}
}
......@@ -208,7 +234,7 @@ public class WxPayCallbackController {
} catch (Exception e) {
logger.error("支付回调处理订单失败 error : {}", e);
} finally {
redisUtils.delete(distributionOrderId);
redisUtils.delete(systemOrderId);
}
return JsonUtils.from(returnMap);
}
......@@ -508,6 +534,67 @@ public class WxPayCallbackController {
}
/**
* 处理开店费缴纳订单回调
* @return
*/
public Result handleOrderOfOpenShop(Transaction transaction) {
try {
LocalDateTime now = LocalDateTime.now();
LocalDateTime endValidTime = now.plusYears(1);
//商户订单号，分销订单号
String systemOrderId = transaction.getOutTradeNo();
//微信支付交易id
String transactionId = transaction.getTransactionId();
//支付成功时间
String payTime = transaction.getSuccessTime();
//支付成功，更新订单状态为待发货
OpenShopCostRecord openShopCostRecord = new OpenShopCostRecord();
openShopCostRecord.setOpenShopCostOrderId(systemOrderId);
openShopCostRecord.setTransactionId(transactionId);
openShopCostRecord.setPayTime(TimeUtil.wxTimeConvertToDate(payTime));
openShopCostRecord.setStartValidTime(DateUtils.fromLocalDateTime(now));
openShopCostRecord.setEndValidTime(DateUtils.fromLocalDateTime(endValidTime));
openShopCostRecord.setIsValid(true);
openShopCostRecordDao.update(openShopCostRecord);
logger.info(">>>>>>>>>>>> 开店费缴纳订单，微信支付回调通知处理成功 <<<<<<<<<<<<");
return Result.success();
} catch (Exception e) {
logger.error(">>>>>>>>>>>> 开店费缴纳订单，微信支付回调通知处理失败 error :{}", e);
}
return Result.failed();
}
/**
* 处理开店质保金订单回调
* @return
*/
public Result handleOrderOfGuaranteeMoney(Transaction transaction) {
try {
//商户订单号，分销订单号
String systemOrderId = transaction.getOutTradeNo();
//微信支付交易id
String transactionId = transaction.getTransactionId();
//支付成功时间
String payTime = transaction.getSuccessTime();
//支付成功，更新订单状态为待发货
GuaranteeMoneyRecord guaranteeMoneyRecord = new GuaranteeMoneyRecord();
guaranteeMoneyRecord.setGuaranteeMoneyOrderId(systemOrderId);
guaranteeMoneyRecord.setTransactionId(transactionId);
guaranteeMoneyRecord.setPayTime(TimeUtil.wxTimeConvertToDate(payTime));
guaranteeMoneyRecord.setIsValid(true);
guaranteeMoneyRecordDao.update(guaranteeMoneyRecord);
logger.info(">>>>>>>>>>>> 开店质保金订单，微信支付回调通知处理成功 <<<<<<<<<<<<");
return Result.success();
} catch (Exception e) {
logger.error(">>>>>>>>>>>> 开店质保金订单，微信支付回调通知处理失败 error :{}", e);
}
return Result.failed();
}
/**
* 获取请求体
*
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/entity/vo/distribution/SelfPageInfoVo.java
View file @ 11f8b003
......@@ -80,5 +80,14 @@ public class SelfPageInfoVo implements Entity {
*/
private Boolean tagOperateAble = false;
/**
* 开店申请单状态，尚未申请为-1
*/
private Integer openShopState;
/**
* 是否缴纳质保金，0未缴纳1缴纳
*/
private Integer isPayGuaranteeMoney;
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SelfPageServiceImpl.java
View file @ 11f8b003
package com.wwdz.ch.wx.impl.distribution;
import com.alibaba.dubbo.config.annotation.Reference;
import com.wwdz.ch.core.consts.CommConsts;
import com.wwdz.ch.core.consts.DistributionEnum;
import com.wwdz.ch.core.consts.UserEnum;
import com.wwdz.ch.core.consts.*;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.CacheUtil;
import com.wwdz.ch.core.util.PriceUtil;
......@@ -12,11 +10,14 @@ import com.wwdz.ch.db.bean.DistributionOrderNum;
import com.wwdz.ch.db.dao.*;
import com.wwdz.ch.db.dao.distribution.*;
import com.wwdz.ch.db.dao.exchange.ExchangeApplyOrderDao;
import com.wwdz.ch.db.dao.openShop.GuaranteeMoneyRecordDao;
import com.wwdz.ch.db.dao.openShop.OpenShopApplyOrderDao;
import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.domain.distribution.AuctionConfig;
import com.wwdz.ch.db.domain.distribution.AuctionRecord;
import com.wwdz.ch.db.domain.distribution.CollectionShareRecord;
import com.wwdz.ch.db.domain.distribution.ShopWhiteList;
import com.wwdz.ch.db.domain.openShop.OpenShopApplyOrder;
import com.wwdz.ch.wx.entity.request.SelfPageRequestDto;
import com.wwdz.ch.wx.entity.vo.distribution.SelfPageInfoVo;
import com.wwdz.ch.wx.service.distribution.SelfPageService;
......@@ -91,6 +92,12 @@ public class SelfPageServiceImpl implements SelfPageService {
@Autowired
TagOperateWhiteListDao tagOperateWhiteListDao;
@Autowired
OpenShopApplyOrderDao openShopApplyOrderDao;
@Autowired
GuaranteeMoneyRecordDao guaranteeMoneyRecordDao;
/**
* PRE_EXCHANGE(6, "待寄至平台"),
* PRE_INSPECTION(8, "待平台验货"),
......@@ -167,8 +174,6 @@ public class SelfPageServiceImpl implements SelfPageService {
long commitNum = exchangeApplyOrderDao.countPreHandleOrderOfCommit(dto.getUserId());
long receiveNum = exchangeApplyOrderDao.countPreHandleOrderOfReceive(dto.getUserId());
selfPageInfoVo.setExchangeApplyOrderNum(commitNum + receiveNum);
//查询4天内出价记录
Date now = new Date();
Instant instant = now.toInstant().minus(Duration.ofDays(4));
......@@ -187,6 +192,19 @@ public class SelfPageServiceImpl implements SelfPageService {
if (tagOperateWhiteListDao.isExisted(dto.getUserId())) {
selfPageInfoVo.setTagOperateAble(true);
}
//判断是否申请开店，开店申请单的状态
OpenShopApplyOrder openShopApplyOrder = openShopApplyOrderDao.findByUserId(dto.getUserId());
if (openShopApplyOrder == null) {
selfPageInfoVo.setOpenShopState(OpenShopApplyOrderEnum.StateEnum.NO_APPLY.getCode());
} else {
selfPageInfoVo.setOpenShopState(openShopApplyOrder.getState());
}
//判断是否缴纳过质保金
if (guaranteeMoneyRecordDao.checkValidRecord(dto.getUserId())) {
selfPageInfoVo.setIsPayGuaranteeMoney(CommonEnum.StateEnum.VALID.getCode());
} else {
selfPageInfoVo.setIsPayGuaranteeMoney(CommonEnum.StateEnum.INVALID.getCode());
}
return Result.success(selfPageInfoVo);
} catch (Exception e) {
logger.error("查询用户个人主页失败 error : {}", e);
......@@ -259,6 +277,21 @@ public class SelfPageServiceImpl implements SelfPageService {
if (tagOperateWhiteListDao.isExisted(dto.getUserId())) {
selfPageInfoVo.setTagOperateAble(true);
}
//判断是否申请开店，开店申请单的状态
OpenShopApplyOrder openShopApplyOrder = openShopApplyOrderDao.findByUserId(dto.getUserId());
if (openShopApplyOrder == null) {
selfPageInfoVo.setOpenShopState(OpenShopApplyOrderEnum.StateEnum.NO_APPLY.getCode());
} else {
selfPageInfoVo.setOpenShopState(openShopApplyOrder.getState());
}
//判断是否缴纳过质保金
if (guaranteeMoneyRecordDao.checkValidRecord(dto.getUserId())) {
selfPageInfoVo.setIsPayGuaranteeMoney(CommonEnum.StateEnum.VALID.getCode());
} else {
selfPageInfoVo.setIsPayGuaranteeMoney(CommonEnum.StateEnum.INVALID.getCode());
}
return Result.success(selfPageInfoVo);
} catch (Exception e) {
logger.error("查询藏家个人主页失败 error : {}", e);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/openShop/OpenShopServiceImpl.java
View file @ 11f8b003
......@@ -4,6 +4,7 @@ import com.wwdz.ch.core.api.wxpay.WxPayServiceApi;
import com.wwdz.ch.core.consts.CommConsts;
import com.wwdz.ch.core.consts.CommonEnum;
import com.wwdz.ch.core.consts.OpenShopApplyOrderEnum;
import com.wwdz.ch.core.entity.openShop.OpenShopApplyOrderVo;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.IdUtils;
import com.wwdz.ch.core.util.PriceUtil;
......@@ -26,6 +27,7 @@ import com.wwdz.ch.db.dto.request.openShop.OpenShopInfoRequestDto;
import com.wwdz.ch.wx.impl.AiAssistantServiceImpl;
import com.wwdz.ch.wx.service.openShop.OpenShopService;
import com.wwdz.mall.common.util.CommonUtil;
import com.xxdxxs.utils.EntityMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -93,12 +95,16 @@ public class OpenShopServiceImpl implements OpenShopService {
public Result createOpenShopApplyOrder(OpenShopInfoRequestDto dto) {
try {
Date now = new Date();
//月底修改为300
long openShopAmount = 10000L;
//创建申请单
String orderId = IdUtils.getOrderNumber("OA");
OpenShopApplyOrder openShopApplyOrder = new OpenShopApplyOrder();
openShopApplyOrder.setOpenShopApplyOrderId(orderId);
openShopApplyOrder.setUserId(dto.getUserId());
openShopApplyOrder.setUserOpenId(dto.getUserOpenId());
openShopApplyOrder.setOpenShopAmount(openShopAmount);
openShopApplyOrder.setCreateTime(now);
openShopApplyOrder.setUpdateTime(now);
openShopApplyOrder.setState(OpenShopApplyOrderEnum.StateEnum.PRE_PAY.getCode());
......@@ -123,7 +129,7 @@ public class OpenShopServiceImpl implements OpenShopService {
userBankCard.setName(dto.getName());
userBankCard.setBankName(dto.getBankName());
userBankCard.setCreateTime(now);
userBankCard.setState(0);
userBankCard.setState(CommonEnum.StateEnum.VALID.getCode());
userBankCardDao.insert(userBankCard);
//创建开店费用订单
String openShopCostOrderId = IdUtils.getOrderNumber(CommConsts.OPEN_SHOP_COST_ORDER_PREFIX);
......@@ -131,8 +137,8 @@ public class OpenShopServiceImpl implements OpenShopService {
openShopCostRecord.setOpenShopCostOrderId(openShopCostOrderId);
openShopCostRecord.setUserId(dto.getUserId());
openShopCostRecord.setUserOpenId(dto.getUserOpenId());
//月底修改为300
openShopCostRecord.setAmount(10000L);
openShopCostRecord.setAmount(openShopAmount);
openShopCostRecord.setCreateTime(now);
openShopCostRecord.setUpdateTime(now);
openShopCostRecord.setIsValid(false);
......@@ -151,9 +157,9 @@ public class OpenShopServiceImpl implements OpenShopService {
@Override
public Result getPayParam(OpenShopApplyOrderRequestDto dto) {
try {
DistributionOrderRequestDto prePayDto = new DistributionOrderRequestDto();
prePayDto.setDistributionOrderId(dto.getOpenShopApplyOrderId());
String orderId = dto.getSystemOrderId();
DistributionOrderRequestDto prePayDto = new DistributionOrderRequestDto();
prePayDto.setDistributionOrderId(orderId);
long amount = 0;
String itemName = "店铺费用";
//开店费用
......@@ -210,4 +216,35 @@ public class OpenShopServiceImpl implements OpenShopService {
}
return Result.failed();
}
@Override
public Result findOpenShopApplyOrder(OpenShopApplyOrderRequestDto dto) {
try {
long userId = dto.getUserId();
OpenShopApplyOrder openShopApplyOrder = openShopApplyOrderDao.findByUserId(userId);
if (openShopApplyOrder == null) {
return Result.success();
}
OpenShopApplyOrderVo openShopApplyOrderVo = new OpenShopApplyOrderVo();
EntityMapper.copyAttribute(openShopApplyOrder, openShopApplyOrderVo);
openShopApplyOrderVo.setStateName(OpenShopApplyOrderEnum.StateEnum.getNameByCode(openShopApplyOrderVo.getState()));
//查询身份证信息
CollectorWhiteList collectorWhiteList = collectorWhiteListDao.findByUserIdWithoutValid(userId);
openShopApplyOrderVo.setIdCardFrontImage(collectorWhiteList.getIdCardFrontImage());
openShopApplyOrderVo.setIdCardBackImage(collectorWhiteList.getIdCardBackImage());
//查询银行卡信息
UserBankCard userBankCard = userBankCardDao.findById(userId);
openShopApplyOrderVo.setCardId(userBankCard.getCardId());
openShopApplyOrderVo.setBankName(userBankCard.getBankName());
openShopApplyOrderVo.setName(userBankCard.getName());
openShopApplyOrderVo.setOpenShopAmount(PriceUtil.convertPriceFenToYuan(openShopApplyOrder.getOpenShopAmount()));
return Result.success(openShopApplyOrderVo);
} catch (Exception e) {
logger.error("查询开店申请订单失败 error : {}", e);
}
return Result.failed();
}
}
ch-wx-api/src/main/java/com/wwdz/ch/wx/service/openShop/OpenShopService.java
View file @ 11f8b003
......@@ -36,4 +36,12 @@ public interface OpenShopService {
* @return
*/
Result createGuaranteeMoneyOrder(GuaranteeMoneyRecordRequestDto dto);
/**
* 查询开店申请单
* @param dto
* @return
*/
Result findOpenShopApplyOrder(OpenShopApplyOrderRequestDto dto);
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment