Commit dc493961 authored by cy's avatar cy

充值卡添加初始卡序号

parent 50feb6b4
......@@ -11,6 +11,7 @@
<result column="is_delete" property="isDelete"/>
<result column="create_time" property="createTime"/>
<result column="update_time" property="updateTime"/>
<result column="card_no" property="cardNo"/>
</resultMap>
<sql id="table">
......@@ -23,12 +24,12 @@
</sql>
<sql id="cols_exclude_id">
card_number,batch_number,is_make_card, is_activite,is_delete,create_time,update_time
card_number,batch_number,is_make_card, is_activite,is_delete,create_time,update_time,card_no
</sql>
<sql id="vals">
#{cardNumber},#{batchNumber},#{isMakeCard},#{isActivite},
#{isDelete},now(),now()
#{isDelete},now(),now(),#{cardNo}
</sql>
<sql id="updateCondition">
......@@ -37,7 +38,8 @@
<if test="phone != null">is_make_card =#{isMakeCard},</if>
<if test="headImage != null">is_activite =#{isMakeCard},</if>
<if test="examType != null">is_delete = #{isDelete},</if>
update_time =now()
update_time =now(),
<if test="cardNo != null">card_no = #{cardNo}</if>
</sql>
<sql id="criteria">
......@@ -48,6 +50,7 @@
<if test="examType != null">and is_delete = #{isDelete}</if>
<if test="createTime != null">and create_time &gt;= #{createTime}</if>
<if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
<if test="cardNo != null">and card_no= #{cardNo}</if>
</sql>
<insert id="add" parameterType="cn.wisenergy.model.app.User" keyProperty="id" useGeneratedKeys="true">
......
......@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.io.Serializable;
import java.math.BigInteger;
import java.util.Date;
@Data
......@@ -58,4 +59,10 @@ public class RefillCard implements Serializable {
*/
@ApiModelProperty(value = "更改时间",name = "updateTime")
private Date updateTime;
/**
* 充值卡初始序号
*/
@ApiModelProperty(value = "充值卡初始序号",name = "cardNo")
private BigInteger cardNo;
}
......@@ -4,6 +4,8 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigInteger;
@Data
@ApiModel(value = "RefillCardDto")
public class RefillCardDto {
......@@ -37,4 +39,9 @@ public class RefillCardDto {
@ApiModelProperty(value = "是否已激活 0:已激活 1:未激活 ",name = "isActivite")
private Integer isActivite;
/**
* 充值卡初始序号
*/
@ApiModelProperty(value = "充值卡初始序号",name = "cardNo")
private BigInteger cardNo;
}
......@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import java.math.BigInteger;
import java.util.ArrayList;
/**
......@@ -31,9 +32,11 @@ public class RefillCardManager {
public R<Boolean> addCardMannger(RefillCard byId){
//获取充值卡的卡数,并生成卡片
ArrayList<CardInfo> cardInfos = new ArrayList<>();
BigInteger cardNumber=byId.getCardNo();
BigInteger num = new BigInteger("1");
//子卡添加
for (int i = 0; i < byId.getCardNumber(); i++) {
cardNumber=cardNumber.add(num);
CardInfo cardInfo = new CardInfo();
cardInfo.setBatchNumber(byId.getBatchNumber());
cardInfo.setIsDelete(0);
......@@ -41,7 +44,7 @@ public class RefillCardManager {
cardInfo.setStatus(0);
cardInfo.setLimit(3);
cardInfo.setSecretKey(SecretkeyUtil.getSecretkey());
cardInfo.setCardNumber(CardNumberUtil.cardNumber());
cardInfo.setCardNumber(String.valueOf(cardNumber));
cardInfos.add(cardInfo);
}
int add1 = cardMapper.add(cardInfos);
......
......@@ -8,6 +8,7 @@ import cn.wisenergy.service.app.RefillCardService;
import com.github.pagehelper.PageInfo;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
......@@ -15,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletResponse;
import java.math.BigInteger;
@Api(tags = "充值卡管理")
@RestController
......@@ -26,14 +28,17 @@ public class RefillCardController {
private RefillCardService refillCardService;
@ApiOperation(value = "添加充值卡",notes = "添加充值卡",httpMethod = "POST")
@ApiImplicitParam(name = "numbers",value = "卡的数量",dataType="int",required = true)
@ApiImplicitParams({
@ApiImplicitParam(name = "numbers",value = "卡的数量",dataType="int",required = true),
@ApiImplicitParam(name = "cardNo",value = "充值卡初始序号",dataType="BigInteger")
})
@PostMapping("/manage")
public R<Boolean> manage(Integer numbers){
public R<Boolean> manage(Integer numbers,BigInteger cardNo){
log.info("RefillCardController[].manage[].input.param,numbers"+numbers);
//创建对象参数
RefillCard refillCard = new RefillCard();
refillCard.setCardNumber(numbers);
refillCard.setCardNo(cardNo);
return refillCardService.add(refillCard);
}
......
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