diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCardPassword.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java similarity index 82% rename from mallinkService/src/main/java/com/iformall/domain/po/WxCardPassword.java rename to mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java index 285e5bf2e..dfd0616c6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxCardPassword.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxCouponPassword.java @@ -5,17 +5,14 @@ import lombok.EqualsAndHashCode; import javax.persistence.*; import java.util.*; -import java.math.*; import javax.persistence.Transient; import java.util.List; import javax.persistence.Id; -import java.io.Serializable; -@Table(name = "wx_card_password") +@Table(name = "wx_coupon_password") @Data @EqualsAndHashCode(callSuper = true) -public class WxCardPassword extends BaseEntity { - private static final long serialVersionUID = 1L; +public class WxCouponPassword extends BaseEntity { @Id protected Long id; @@ -33,7 +30,7 @@ public class WxCardPassword extends BaseEntity { private Integer status; @io.swagger.annotations.ApiModelProperty(value="卡密发送到手机",name="sendedPhone") private String sendedPhone; - @io.swagger.annotations.ApiModelProperty(value="卡包ID",name="cardId") + @io.swagger.annotations.ApiModelProperty(value="卡包ID(coupon_order_id/card_id)",name="cardId") private Long cardId; @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") private Date createDate; diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardPasswordMapper.java deleted file mode 100644 index 73ebe9c52..000000000 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardPasswordMapper.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.iformall.mapper; - -import java.util.*; -import com.iformall.common.CommonMapper; -import org.apache.ibatis.annotations.Param; -import com.iformall.domain.po.WxCardPassword; - -public interface WxCardPasswordMapper extends CommonMapper { - - List findList(WxCardPassword wxCardPassword); - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java new file mode 100644 index 000000000..b50173d8c --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCouponPasswordMapper.java @@ -0,0 +1,16 @@ +package com.iformall.mapper; + +import java.util.*; +import com.iformall.common.CommonMapper; +import com.iformall.domain.po.WxCouponPassword; + +public interface WxCouponPasswordMapper extends CommonMapper { + + List findList(WxCouponPassword wxCouponPassword); + + + + + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardPasswordService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java similarity index 63% rename from mallinkService/src/main/java/com/iformall/service/WxCardPasswordService.java rename to mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java index b20068e40..0482007d6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardPasswordService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponPasswordService.java @@ -1,10 +1,9 @@ package com.iformall.service; -import java.util.*; import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxCardPassword; +import com.iformall.domain.po.WxCouponPassword; -public interface WxCardPasswordService { +public interface WxCouponPasswordService { /** * 根据实体查询分页列表 @@ -14,7 +13,7 @@ public interface WxCardPasswordService { * @param pageSize * @return */ - PageInfo listAsPage(WxCardPassword record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCouponPassword record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 @@ -22,14 +21,14 @@ public interface WxCardPasswordService { * @param id * @return */ - WxCardPassword getById(Long id); + WxCouponPassword getById(Long id); /** * 保存或更新实体 * * @param record */ - void saveOrUpdate(WxCardPassword record); + void saveOrUpdate(WxCouponPassword record); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardPasswordServiceImpl.java deleted file mode 100644 index 08d3595f0..000000000 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardPasswordServiceImpl.java +++ /dev/null @@ -1,54 +0,0 @@ -package com.iformall.service.impl; - -import java.util.*; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; -import com.iformall.domain.po.WxCardPassword; -import com.iformall.mapper.WxCardPasswordMapper; -import com.iformall.service.WxCardPasswordService; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import com.iformall.common.IdWorker; - -@Service -public class WxCardPasswordServiceImpl implements WxCardPasswordService { - - @Autowired - WxCardPasswordMapper wxCardPasswordMapper; - - - @Override - public PageInfo listAsPage(WxCardPassword record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardPasswordMapper.findList(record)); - } - - @Override - public WxCardPassword getById(Long id) { - return wxCardPasswordMapper.selectByPrimaryKey(id); - } - - @Override - public void saveOrUpdate(WxCardPassword record) { - if (record.getId() == null) { - //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); - final IdWorker idWorker = IdWorker.get(); - record.setId(idWorker.nextId()); - wxCardPasswordMapper.insertSelective(record); - } else { - wxCardPasswordMapper.updateByPrimaryKeySelective(record); - } - } - - @Override - public void deleteById(Long id) { - wxCardPasswordMapper.deleteByPrimaryKey(id); - } - - - - - - - - -} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java new file mode 100644 index 000000000..dfdb4925d --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPasswordServiceImpl.java @@ -0,0 +1,53 @@ +package com.iformall.service.impl; + +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.WxCouponPassword; +import com.iformall.mapper.WxCouponPasswordMapper; +import com.iformall.service.WxCouponPasswordService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.iformall.common.IdWorker; + +@Service +public class WxCouponPasswordServiceImpl implements WxCouponPasswordService { + + @Autowired + WxCouponPasswordMapper wxCouponPasswordMapper; + + + @Override + public PageInfo listAsPage(WxCouponPassword record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponPasswordMapper.findList(record)); + } + + @Override + public WxCouponPassword getById(Long id) { + return wxCouponPasswordMapper.selectByPrimaryKey(id); + } + + @Override + public void saveOrUpdate(WxCouponPassword record) { + if (record.getId() == null) { + //record.setId(UUID.randomUUID().toString().replaceAll("-", "")); + final IdWorker idWorker = IdWorker.get(); + record.setId(idWorker.nextId()); + wxCouponPasswordMapper.insertSelective(record); + } else { + wxCouponPasswordMapper.updateByPrimaryKeySelective(record); + } + } + + @Override + public void deleteById(Long id) { + wxCouponPasswordMapper.deleteByPrimaryKey(id); + } + + + + + + + + +} diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index a26b7c95e..8cc6436dc 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -64,6 +64,8 @@ import java.util.stream.Collectors; @Autowired WxCardInfoMapper wxCardInfoMapper; + @Autowired + @Override public ResultData list(WxCoupon wxCoupon, Integer pageNum, Integer pageSize) { if (null == wxCoupon) wxCoupon = new WxCoupon(); @@ -410,6 +412,8 @@ import java.util.stream.Collectors; wxOrderService.updateOrderGroupStatusByCouponId(record.getId(), record.getTenantId(), EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()); //修改卡状态 wxCardInfoMapper.updateTransferStatusByCouponId(record.getId()); + // 下架相关卡密 + } record.setUpdateDate(new Date()); diff --git a/mallinkService/src/main/resources/mapper/WxCardPasswordMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml similarity index 92% rename from mallinkService/src/main/resources/mapper/WxCardPasswordMapper.xml rename to mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml index 518ca8c8e..cd76956d5 100644 --- a/mallinkService/src/main/resources/mapper/WxCardPasswordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponPasswordMapper.xml @@ -1,7 +1,7 @@ - - + + @@ -55,7 +55,7 @@ order by ${sortColumns} - select from wx_card_password