Skip to content

GitLab

Q
qk_backend
Commit 7e720302 authored by shiyu's avatar shiyu
Browse files
Options

后台查询开店申请单

parent fa8b9672
Show whitespace changes
Inline Side-by-side
Showing with 469 additions and 13 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/SysOpenShopApplyOrderController.java
View file @ 7e720302
package com.wwdz.ch.admin.controller;
import com.alibaba.fastjson.JSON;
import com.wwdz.ch.admin.service.SysOpenShopApplyOrderService;
import com.wwdz.ch.admin.service.SysSupplierItemService;
import com.wwdz.ch.core.consts.ResultCode;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.dto.request.distribution.SpecialPerformanceRequestDto;
import com.wwdz.ch.db.dto.request.openShop.OpenShopApplyOrderRequestDto;
import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.StringUtils;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
......@@ -7,5 +21,39 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("/admin/openShopApplyOrder")
public class SysOpenShopApplyOrderController {
private static final Logger logger = LoggerFactory.getLogger(SysOpenShopApplyOrderController.class);
@Autowired
SysOpenShopApplyOrderService sysOpenShopApplyOrderService;
@ApiOperation(value = "查询申请开店订单列表")
@PostMapping("/findList")
public Result findList(@RequestBody OpenShopApplyOrderRequestDto dto) {
logger.info("查询申请开店订单列表,请求参数:{}", JSON.toJSONString(dto));
return sysOpenShopApplyOrderService.findList(dto);
}
@ApiOperation(value = "查询申请开店订单详情")
@PostMapping("/findDetail")
public Result findDetail(@RequestBody OpenShopApplyOrderRequestDto dto) {
logger.info("查询申请开店订单详情,请求参数:{}", JSON.toJSONString(dto));
if (StringUtils.isEmpty(dto.getOpenShopApplyOrderId())) {
return Result.failed(ResultCode.PARAM_ERROR);
}
return sysOpenShopApplyOrderService.findDetail(dto);
}
@ApiOperation(value = "审核开店申请单")
@PostMapping("/auditApplyOrder")
public Result auditApplyOrder(@RequestBody OpenShopApplyOrderRequestDto dto) {
logger.info("审核开店申请单,请求参数:{}", JSON.toJSONString(dto));
if (StringUtils.isEmpty(dto.getOpenShopApplyOrderId()) || dto.getState() == null) {
return Result.failed(ResultCode.PARAM_ERROR);
}
return sysOpenShopApplyOrderService.auditApplyOrder(dto);
}
}
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysOpenShopApplyOrderServiceImpl.java 0 → 100644
View file @ 7e720302
package com.wwdz.ch.admin.impl;
import com.github.pagehelper.PageInfo;
import com.wwdz.ch.admin.service.SysOpenShopApplyOrderService;
import com.wwdz.ch.core.consts.OpenShopApplyOrderEnum;
import com.wwdz.ch.core.entity.openShop.OpenShopApplyOrderVo;
import com.wwdz.ch.core.type.PageSearchResult;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.CacheUtil;
import com.wwdz.ch.core.util.PriceUtil;
import com.wwdz.ch.core.util.TimeUtil;
import com.wwdz.ch.db.dao.CollectorWhiteListDao;
import com.wwdz.ch.db.dao.FollowFansRecordDao;
import com.wwdz.ch.db.dao.UserDao;
import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
import com.wwdz.ch.db.dao.distribution.UserBankCardDao;
import com.wwdz.ch.db.dao.openShop.OpenShopApplyOrderDao;
import com.wwdz.ch.db.dao.openShop.OpenShopCostRecordDao;
import com.wwdz.ch.db.domain.CollectorWhiteList;
import com.wwdz.ch.db.domain.User;
import com.wwdz.ch.db.domain.distribution.UserBankCard;
import com.wwdz.ch.db.domain.openShop.OpenShopApplyOrder;
import com.wwdz.ch.db.domain.openShop.OpenShopCostRecord;
import com.wwdz.ch.db.dto.request.openShop.OpenShopApplyOrderRequestDto;
import com.xxdxxs.utils.DateUtils;
import com.xxdxxs.utils.EntityMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.StringUtils;
import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@Service
public class SysOpenShopApplyOrderServiceImpl implements SysOpenShopApplyOrderService {
private static final Logger logger = LoggerFactory.getLogger(SysOpenShopApplyOrderServiceImpl.class);
@Autowired
OpenShopApplyOrderDao openShopApplyOrderDao;
@Autowired
UserDao userDao;
@Autowired
CacheUtil cacheUtil;
@Autowired
FollowFansRecordDao followFansRecordDao;
@Autowired
SupplierItemDao supplierItemDao;
@Autowired
CollectorWhiteListDao collectorWhiteListDao;
@Autowired
UserBankCardDao userBankCardDao;
@Autowired
OpenShopCostRecordDao openShopCostRecordDao;
@Override
public Result findList(OpenShopApplyOrderRequestDto dto) {
try {
List<OpenShopApplyOrderVo> openShopApplyOrderVos = new ArrayList<>();
//根据用户名称搜索，先查询对应名称的userid
if (StringUtils.hasLength(dto.getUserName())) {
List<User> userList = userDao.findByNickName(dto.getUserName());
List<Long> userIdList = userList.stream().map(User::getId).collect(Collectors.toList());
dto.setUserIdList(userIdList);
}
List<OpenShopApplyOrder> list = openShopApplyOrderDao.findByPage(dto);
PageInfo pageInfo = new PageInfo<>(list);
for (OpenShopApplyOrder openShopApplyOrder : list) {
OpenShopApplyOrderVo openShopApplyOrderVo = new OpenShopApplyOrderVo();
EntityMapper.copyAttribute(openShopApplyOrder, openShopApplyOrderVo);
openShopApplyOrderVo.setUserName(cacheUtil.getAppletUserNameById(openShopApplyOrder.getUserId()));
openShopApplyOrderVos.add(openShopApplyOrderVo);
}
return Result.success(PageSearchResult.of(pageInfo, openShopApplyOrderVos));
} catch (Exception e) {
logger.error("查询申请开店订单列表失败 error:{}", e);
}
return Result.failed();
}
@Override
public Result findDetail(OpenShopApplyOrderRequestDto dto) {
try {
OpenShopApplyOrder openShopApplyOrder = openShopApplyOrderDao.findByOrderId(dto.getOpenShopApplyOrderId());
long userId = openShopApplyOrder.getUserId();
OpenShopApplyOrderVo openShopApplyOrderVo = new OpenShopApplyOrderVo();
EntityMapper.copyAttribute(openShopApplyOrder, openShopApplyOrderVo);
openShopApplyOrderVo.setUserName(cacheUtil.getAppletUserNameById(openShopApplyOrder.getUserId()));
//查询粉丝数
long fansNum = followFansRecordDao.countFans(userId);
openShopApplyOrderVo.setFansNum(fansNum);
//查询发布的商品数量
long itemNum = supplierItemDao.countByCreatorId(userId);
openShopApplyOrderVo.setUploadItemNum(itemNum);
//开店资料
//查询身份证信息
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();
}
@Transactional
@Override
public Result auditApplyOrder(OpenShopApplyOrderRequestDto dto) {
try {
OpenShopApplyOrder openShopApplyOrder = openShopApplyOrderDao.findByOrderId(dto.getOpenShopApplyOrderId());
openShopApplyOrderDao.updateState(dto.getOpenShopApplyOrderId(), dto.getState());
if (OpenShopApplyOrderEnum.StateEnum.PASSED.getCode() == dto.getState()) {
LocalDateTime now = LocalDateTime.now();
LocalDateTime endValidTime = now.plusYears(1);
//审核通过，把藏家白名单设置为生效
CollectorWhiteList collectorWhiteList = new CollectorWhiteList();
collectorWhiteList.setCollectorId(openShopApplyOrder.getUserId());
collectorWhiteList.setEndValidTime(DateUtils.fromLocalDateTime(endValidTime));
collectorWhiteList.setIsValid(true);
collectorWhiteListDao.upsert(collectorWhiteList);
//查询开店费缴纳订单,用于未支付订单
OpenShopCostRecord openShopCostRecord = openShopCostRecordDao.findByUserId(openShopApplyOrder.getUserId());
OpenShopCostRecord updateDto = new OpenShopCostRecord();
updateDto.setOpenShopCostOrderId(openShopCostRecord.getOpenShopCostOrderId());
updateDto.setStartValidTime(DateUtils.fromLocalDateTime(now));
updateDto.setEndValidTime(DateUtils.fromLocalDateTime(endValidTime));
openShopCostRecordDao.update(openShopCostRecord);
}
return Result.success();
} catch (Exception e) {
logger.error("审核申请开店订单失败 error:{}", e);
TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
}
return Result.failed();
}
}
ch-admin-api/src/main/java/com/wwdz/ch/admin/service/SysOpenShopApplyOrderService.java 0 → 100644
View file @ 7e720302
package com.wwdz.ch.admin.service;
import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.db.dto.request.openShop.OpenShopApplyOrderRequestDto;
public interface SysOpenShopApplyOrderService {
/**
* 查询申请开店订单列表
* @param dto
* @return
*/
Result findList(OpenShopApplyOrderRequestDto dto);
/**
* 查询申请开店订单详情
* @param dto
* @return
*/
Result findDetail(OpenShopApplyOrderRequestDto dto);
/**
* 审核开店申请单
* @param dto
* @return
*/
Result auditApplyOrder(OpenShopApplyOrderRequestDto dto);
}
ch-core/src/main/java/com/wwdz/ch/core/entity/openShop/OpenShopApplyOrderVo.java
View file @ 7e720302
......@@ -7,6 +7,11 @@ import java.util.Date;
@Data
public class OpenShopApplyOrderVo implements Entity {
/**
* 开店申请单
*/
private String openShopApplyOrderId;
/**
* 用户id
*/
......@@ -67,4 +72,15 @@ public class OpenShopApplyOrderVo implements Entity {
private Integer state;
private String stateName;
/**
* 开店费缴纳订单号
*/
private String openShopCostOrderId;
/**
* 备注说明
*/
private String remark;
}
ch-dao/src/main/java/com/wwdz/ch/db/dao/openShop/OpenShopApplyOrderDao.java
View file @ 7e720302
......@@ -15,6 +15,10 @@ public interface OpenShopApplyOrderDao {
boolean updateState(String orderId, int state);
boolean update(OpenShopApplyOrder openShopApplyOrder);
OpenShopApplyOrder findByUserId(long userId);
OpenShopApplyOrder findByOrderId(String orderId);
}
ch-dao/src/main/java/com/wwdz/ch/db/dao/openShop/OpenShopCostRecordDao.java
View file @ 7e720302
package com.wwdz.ch.db.dao.openShop;
import com.wwdz.ch.db.domain.openShop.GuaranteeMoneyRecord;
import com.wwdz.ch.db.domain.openShop.OpenShopCostRecord;
public interface OpenShopCostRecordDao {
......@@ -9,6 +8,9 @@ public interface OpenShopCostRecordDao {
boolean update(OpenShopCostRecord openShopCostRecord);
OpenShopCostRecord findByUserId(long userId);
OpenShopCostRecord findByOrderId(String orderId);
/**
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/openShop/OpenShopApplyOrder.java
View file @ 7e720302
......@@ -10,7 +10,7 @@ import lombok.Data;
/**
* @author shiyu
* @date 2024/10/29
* @date 2024/10/30
*/
@Data
public class OpenShopApplyOrder implements Entity {
......@@ -56,6 +56,11 @@ public class OpenShopApplyOrder implements Entity {
*/
private Integer state;
/**
* 备注说明
*/
private String remark;
private static final long serialVersionUID = 1L;
@Override
......@@ -73,6 +78,7 @@ public class OpenShopApplyOrder implements Entity {
sb.append(", createTime=").append(createTime);
sb.append(", updateTime=").append(updateTime);
sb.append(", state=").append(state);
sb.append(", remark=").append(remark);
sb.append(", serialVersionUID=").append(serialVersionUID);
sb.append("]");
return sb.toString();
......@@ -98,7 +104,8 @@ public class OpenShopApplyOrder implements Entity {
&& (this.getGuaranteeAmount() == null ? other.getGuaranteeAmount() == null : this.getGuaranteeAmount().equals(other.getGuaranteeAmount()))
&& (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
&& (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
&& (this.getState() == null ? other.getState() == null : this.getState().equals(other.getState()));
&& (this.getState() == null ? other.getState() == null : this.getState().equals(other.getState()))
&& (this.getRemark() == null ? other.getRemark() == null : this.getRemark().equals(other.getRemark()));
}
@Override
......@@ -114,6 +121,7 @@ public class OpenShopApplyOrder implements Entity {
result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
result = prime * result + ((getState() == null) ? 0 : getState().hashCode());
result = prime * result + ((getRemark() == null) ? 0 : getRemark().hashCode());
return result;
}
......@@ -133,7 +141,8 @@ public class OpenShopApplyOrder implements Entity {
guaranteeAmount("guarantee_amount", "guaranteeAmount", "BIGINT", false),
createTime("create_time", "createTime", "TIMESTAMP", false),
updateTime("update_time", "updateTime", "TIMESTAMP", false),
state("state", "state", "INTEGER", true);
state("state", "state", "INTEGER", true),
remark("remark", "remark", "VARCHAR", false);
/**
* This field was generated by MyBatis Generator.
......
ch-dao/src/main/java/com/wwdz/ch/db/domain/openShop/OpenShopApplyOrderExample.java
View file @ 7e720302
......@@ -1355,6 +1355,148 @@ public class OpenShopApplyOrderExample {
addCriterion("`state` not between", value1, value2, "state");
return (Criteria) this;
}
public Criteria andRemarkIsNull() {
addCriterion("remark is null");
return (Criteria) this;
}
public Criteria andRemarkIsNotNull() {
addCriterion("remark is not null");
return (Criteria) this;
}
public Criteria andRemarkEqualTo(String value) {
addCriterion("remark =", value, "remark");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table open_shop_apply_order
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRemarkEqualToColumn(OpenShopApplyOrder.Column column) {
addCriterion(new StringBuilder("remark = ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRemarkNotEqualTo(String value) {
addCriterion("remark <>", value, "remark");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table open_shop_apply_order
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRemarkNotEqualToColumn(OpenShopApplyOrder.Column column) {
addCriterion(new StringBuilder("remark <> ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRemarkGreaterThan(String value) {
addCriterion("remark >", value, "remark");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table open_shop_apply_order
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRemarkGreaterThanColumn(OpenShopApplyOrder.Column column) {
addCriterion(new StringBuilder("remark > ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRemarkGreaterThanOrEqualTo(String value) {
addCriterion("remark >=", value, "remark");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table open_shop_apply_order
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRemarkGreaterThanOrEqualToColumn(OpenShopApplyOrder.Column column) {
addCriterion(new StringBuilder("remark >= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRemarkLessThan(String value) {
addCriterion("remark <", value, "remark");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table open_shop_apply_order
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRemarkLessThanColumn(OpenShopApplyOrder.Column column) {
addCriterion(new StringBuilder("remark < ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRemarkLessThanOrEqualTo(String value) {
addCriterion("remark <=", value, "remark");
return (Criteria) this;
}
/**
* This method was generated by MyBatis Generator.
* This method corresponds to the database table open_shop_apply_order
*
* @mbg.generated
* @project https://github.com/itfsw/mybatis-generator-plugin
*/
public Criteria andRemarkLessThanOrEqualToColumn(OpenShopApplyOrder.Column column) {
addCriterion(new StringBuilder("remark <= ").append(column.getEscapedColumnName()).toString());
return (Criteria) this;
}
public Criteria andRemarkLike(String value) {
addCriterion("remark like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotLike(String value) {
addCriterion("remark not like", value, "remark");
return (Criteria) this;
}
public Criteria andRemarkIn(List<String> values) {
addCriterion("remark in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotIn(List<String> values) {
addCriterion("remark not in", values, "remark");
return (Criteria) this;
}
public Criteria andRemarkBetween(String value1, String value2) {
addCriterion("remark between", value1, value2, "remark");
return (Criteria) this;
}
public Criteria andRemarkNotBetween(String value1, String value2) {
addCriterion("remark not between", value1, value2, "remark");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
ch-dao/src/main/java/com/wwdz/ch/db/impl/openShop/OpenShopApplyOrderDaoImpl.java
View file @ 7e720302
......@@ -46,6 +46,14 @@ public class OpenShopApplyOrderDaoImpl implements OpenShopApplyOrderDao {
return openShopApplyOrderMapper.updateByExampleSelective(openShopApplyOrder, example) > 0;
}
@Override
public boolean update(OpenShopApplyOrder openShopApplyOrder) {
OpenShopApplyOrderExample example = new OpenShopApplyOrderExample();
OpenShopApplyOrderExample.Criteria criteria = example.createCriteria();
criteria.andOpenShopApplyOrderIdEqualTo(openShopApplyOrder.getOpenShopApplyOrderId());
openShopApplyOrder.setUpdateTime(new Date());
return openShopApplyOrderMapper.updateByExampleSelective(openShopApplyOrder, example) > 0;
}
@Override
public OpenShopApplyOrder findByUserId(long userId) {
......@@ -55,4 +63,13 @@ public class OpenShopApplyOrderDaoImpl implements OpenShopApplyOrderDao {
example.setOrderByClause("create_time desc");
return openShopApplyOrderMapper.selectOneByExample(example);
}
@Override
public OpenShopApplyOrder findByOrderId(String orderId) {
OpenShopApplyOrderExample example = new OpenShopApplyOrderExample();
OpenShopApplyOrderExample.Criteria criteria = example.createCriteria();
criteria.andOpenShopApplyOrderIdEqualTo(orderId);
return openShopApplyOrderMapper.selectOneByExample(example);
}
}
ch-dao/src/main/java/com/wwdz/ch/db/impl/openShop/OpenShopCostRecordDaoImpl.java
View file @ 7e720302
......@@ -41,6 +41,15 @@ public class OpenShopCostRecordDaoImpl implements OpenShopCostRecordDao {
}
@Override
public OpenShopCostRecord findByUserId(long userId) {
OpenShopCostRecordExample example = new OpenShopCostRecordExample();
OpenShopCostRecordExample.Criteria criteria = example.createCriteria();
criteria.andUserIdEqualTo(userId);
example.setOrderByClause("create_time desc");
return openShopCostRecordMapper.selectOneByExample(example);
}
@Override
public boolean checkValidRecord(long userId) {
OpenShopCostRecordExample example = new OpenShopCostRecordExample();
......
ch-dao/src/main/resources/com/wwdz/ch/db/mapper/openShop/OpenShopApplyOrderMapper.xml
View file @ 7e720302
......@@ -11,6 +11,7 @@
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="state" jdbcType="INTEGER" property="state" />
<result column="remark" jdbcType="VARCHAR" property="remark" />
</resultMap>
<sql id="Example_Where_Clause">
<where>
......@@ -72,7 +73,7 @@
</sql>
<sql id="Base_Column_List">
id, open_shop_apply_order_id, user_id, user_open_id, open_shop_amount, guarantee_amount,
create_time, update_time, `state`
create_time, update_time, `state`, remark
</sql>
<select id="selectByExample" parameterType="com.wwdz.ch.db.domain.openShop.OpenShopApplyOrderExample" resultMap="BaseResultMap">
select
......@@ -108,7 +109,7 @@
</when>
<otherwise>
id, open_shop_apply_order_id, user_id, user_open_id, open_shop_amount, guarantee_amount,
create_time, update_time, `state`
create_time, update_time, `state`, remark
</otherwise>
</choose>
from open_shop_apply_order
......@@ -140,7 +141,7 @@
</when>
<otherwise>
id, open_shop_apply_order_id, user_id, user_open_id, open_shop_amount, guarantee_amount,
create_time, update_time, `state`
create_time, update_time, `state`, remark
</otherwise>
</choose>
from open_shop_apply_order
......@@ -162,10 +163,12 @@
</selectKey>
insert into open_shop_apply_order (open_shop_apply_order_id, user_id, user_open_id,
open_shop_amount, guarantee_amount, create_time,
update_time, `state`)
update_time, `state`, remark
)
values (#{openShopApplyOrderId,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, #{userOpenId,jdbcType=VARCHAR},
#{openShopAmount,jdbcType=BIGINT}, #{guaranteeAmount,jdbcType=BIGINT}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER})
#{updateTime,jdbcType=TIMESTAMP}, #{state,jdbcType=INTEGER}, #{remark,jdbcType=VARCHAR}
)
</insert>
<insert id="insertSelective" parameterType="com.wwdz.ch.db.domain.openShop.OpenShopApplyOrder">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Integer">
......@@ -197,6 +200,9 @@
<if test="state != null">
`state`,
</if>
<if test="remark != null">
remark,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="openShopApplyOrderId != null">
......@@ -223,6 +229,9 @@
<if test="state != null">
#{state,jdbcType=INTEGER},
</if>
<if test="remark != null">
#{remark,jdbcType=VARCHAR},
</if>
</trim>
</insert>
<select id="countByExample" parameterType="com.wwdz.ch.db.domain.openShop.OpenShopApplyOrderExample" resultType="java.lang.Long">
......@@ -261,6 +270,9 @@
<if test="record.state != null">
`state` = #{record.state,jdbcType=INTEGER},
</if>
<if test="record.remark != null">
remark = #{record.remark,jdbcType=VARCHAR},
</if>
</set>
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
......@@ -276,7 +288,8 @@
guarantee_amount = #{record.guaranteeAmount,jdbcType=BIGINT},
create_time = #{record.createTime,jdbcType=TIMESTAMP},
update_time = #{record.updateTime,jdbcType=TIMESTAMP},
`state` = #{record.state,jdbcType=INTEGER}
`state` = #{record.state,jdbcType=INTEGER},
remark = #{record.remark,jdbcType=VARCHAR}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -308,6 +321,9 @@
<if test="state != null">
`state` = #{state,jdbcType=INTEGER},
</if>
<if test="remark != null">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
......@@ -320,7 +336,8 @@
guarantee_amount = #{guaranteeAmount,jdbcType=BIGINT},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
`state` = #{state,jdbcType=INTEGER}
`state` = #{state,jdbcType=INTEGER},
remark = #{remark,jdbcType=VARCHAR}
where id = #{id,jdbcType=INTEGER}
</update>
<select id="selectOneByExample" parameterType="com.wwdz.ch.db.domain.openShop.OpenShopApplyOrderExample" resultMap="BaseResultMap">
......@@ -357,7 +374,7 @@
</when>
<otherwise>
id, open_shop_apply_order_id, user_id, user_open_id, open_shop_amount, guarantee_amount,
create_time, update_time, `state`
create_time, update_time, `state`, remark
</otherwise>
</choose>
from open_shop_apply_order
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/api/WxPayCallbackController.java
View file @ 7e720302
......@@ -555,7 +555,7 @@ public class WxPayCallbackController {
String transactionId = transaction.getTransactionId();
//支付成功时间
String payTime = transaction.getSuccessTime();
//支付成功，更新订单状态为待发货
//支付成功，更新开店缴费订单状态更新为有效
OpenShopCostRecord openShopCostRecord = new OpenShopCostRecord();
openShopCostRecord.setOpenShopCostOrderId(systemOrderId);
openShopCostRecord.setTransactionId(transactionId);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/openShop/OpenShopServiceImpl.java
View file @ 7e720302
......@@ -239,6 +239,10 @@ public class OpenShopServiceImpl implements OpenShopService {
openShopApplyOrderVo.setBankName(userBankCard.getBankName());
openShopApplyOrderVo.setName(userBankCard.getName());
openShopApplyOrderVo.setOpenShopAmount(PriceUtil.convertPriceFenToYuan(openShopApplyOrder.getOpenShopAmount()));
//查询开店费缴纳订单,用于未支付订单
OpenShopCostRecord openShopCostRecord = openShopCostRecordDao.findByUserId(userId);
openShopApplyOrderVo.setOpenShopCostOrderId(openShopCostRecord.getOpenShopCostOrderId());
return Result.success(openShopApplyOrderVo);
} catch (Exception e) {
logger.error("查询开店申请订单失败 error : {}", e);
......
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