Просмотр исходного кода

修改小票方法

release_toaliyun_real
lrh 2 лет назад
Родитель
Сommit
4ee1b50651
2 измененных файлов: 8 добавлений и 7 удалений
  1. +7
    -6
      mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java

+ 7
- 6
mallinkService/src/main/java/com/iformall/domain/po/WxCardDailyLog.java Просмотреть файл

@@ -16,35 +16,35 @@ import java.util.List;
public class WxCardDailyLog extends TenantEntity {
protected Long id;
@io.swagger.annotations.ApiModelProperty(value="卡密id",name="cardPasswordId")
@Excel(name = "卡密ID", width = 20, orderNum = "4")
@Excel(name = "实体卡卡号", width = 20, orderNum = "3")
private Long cardPasswordId;
@io.swagger.annotations.ApiModelProperty(value="ip",name="ip")
private String ip;
@io.swagger.annotations.ApiModelProperty(value="",name="price")
private Integer price;
@io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate")
@Excel(name = "操作时间", width = 20, orderNum = "4",format="yyyy-MM-dd HH:mm:ss")
@Excel(name = "操作时间", width = 20, orderNum = "5",format="yyyy-MM-dd HH:mm:ss")
private Date createDate;
@io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate")
private Date updateDate;

@io.swagger.annotations.ApiModelProperty(value="",name="remark")
@Excel(name = "备注", width = 20, orderNum = "4")
@Excel(name = "备注", width = 20, orderNum = "7")
private String remark;

@io.swagger.annotations.ApiModelProperty(value="",name="operatorType")
private Integer operatorType;
@io.swagger.annotations.ApiModelProperty(value="",name="operatorId")
private Long operatorId;
@Excel(name = "操作人", width = 20, orderNum = "4")
@Excel(name = "操作人", width = 20, orderNum = "6")
@io.swagger.annotations.ApiModelProperty(value="EnumUserType",name="operatorUser")
private String operatorUser;

@io.swagger.annotations.ApiModelProperty(value="父卷id",name="couponId")
@Excel(name = "消费卡ID", width = 20, orderNum = "4")
@Excel(name = "卡批次ID", width = 20, orderNum = "0")
private Long couponId;
@io.swagger.annotations.ApiModelProperty(value="卡卷Id",name="cardInfoId")
@Excel(name = "实体卡卡号", width = 20, orderNum = "4")
@Excel(name = "电子卡卡号", width = 20, orderNum = "2")
private Long cardInfoId;
@io.swagger.annotations.ApiModelProperty(value="操作类型 1-创建,2-设置面额,3-充值 EnumOperateLogType",name="type")
private Integer type;
@@ -56,6 +56,7 @@ public class WxCardDailyLog extends TenantEntity {

@io.swagger.annotations.ApiModelProperty(value="卡卷总数",name="count")
@TableField(exist = false)
@Excel(name = "消费卡名称", width = 20, orderNum = "1")
private String title;

private List<Long> couponIds;


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java Просмотреть файл

@@ -394,7 +394,7 @@ public class WxCouponPasswordServiceImpl implements WxCouponPasswordService {
cardSetPrice.setOperatorType(EnumUserType.MALLUSER.getCode());
cardSetPrice.setOperatorId(user.getId());
cardSetPrice.setOperatorUser(user.getUsername());
cardSetPrice.setCouponId(wxCoupon.getCouponId());
cardSetPrice.setCouponId(wxCoupon.getId());
cardSetPrice.setType(EnumOperateLogType.SET_DENOMINATION.getCode());
cardSetPrice.setCount(1);
cardSetPrice.setRemark(user.getUsername() + "给实体卡卡号[" + cardSetPrice.getCardPasswordId() + "]设置了面额,金额:" + cardSetPrice.getPrice()/100 + "元");


Загрузка…
Отмена
Сохранить