diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java index 9de10fafe..057ead7ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCardPayController.java @@ -4,9 +4,12 @@ package com.iformall.controller; import com.github.pagehelper.PageInfo; import com.iformall.common.ResultData; import com.iformall.domain.po.MallUserInfo; +import com.iformall.domain.po.WxCardInfo; import com.iformall.domain.po.WxCardSpend; import com.iformall.domain.po.WxCouponOrder; import com.iformall.domain.vo.WxCardSpendVo; +import com.iformall.domain.vo.WxCardVo; +import com.iformall.service.WxCardInfoService; import com.iformall.service.WxCardSpendService; import com.iformall.service.WxMerchantService; import com.iformall.service.WxOrderService; @@ -14,6 +17,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; +import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -22,6 +26,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.ArrayList; +import java.util.List; + /** * @author Stormeye Wu wuguoqiang@iformall.com */ @@ -37,6 +44,9 @@ public class WxCardPayController extends BaseController { @Autowired WxOrderService wxOrderService; + @Autowired + WxCardInfoService wxCardInfoService; + @Autowired WxCardSpendService wxCardSpendService; @@ -45,13 +55,23 @@ public class WxCardPayController extends BaseController { @ApiImplicitParams({ @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) - public ResultData cardOrderList(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { + public ResultData cardOrderList(@ModelAttribute WxCardVo wxCardVo, Integer pageNum, Integer pageSize) { String ipStr = getIpAddr(); logger.info("cardOrderList: " + ipStr); - if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder(); + if (wxCardVo == null) wxCardVo = new WxCardVo(); MallUserInfo user = getUser(); - wxCouponOrder.setTenantId(user.getTenantId()); - //final PageInfo page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); + wxCardVo.setTenantId(user.getTenantId()); + if(StringUtils.isNotBlank(wxCardVo.getStatusStr())) { + String [] statusAttr = wxCardVo.getStatusStr().split(","); + List tmpList = new ArrayList(); + for(String status: statusAttr) { + tmpList.add(Integer.valueOf(status)); + } + if(!tmpList.isEmpty()) { + wxCardVo.setStatusS(tmpList); + } + } + final PageInfo page = wxCardInfoService.listAsPage(wxCardVo, pageNum, pageSize); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java new file mode 100644 index 000000000..167c3ef19 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardVo.java @@ -0,0 +1,76 @@ +package com.iformall.domain.vo; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.iformall.domain.po.WxCardInfo; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; + +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +@JsonIgnoreProperties(value = {"handler"}) +@Data +@NoArgsConstructor +@ToString(callSuper = true) +@EqualsAndHashCode(callSuper = true) +public class WxCardVo extends WxCardInfo { + + /** 券类型信息 */ + /**封面图**/ + @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") + private String coverImg; + /**券名称**/ + @io.swagger.annotations.ApiModelProperty(value="券名称",name="title") + private String title; + /**副标题**/ + @io.swagger.annotations.ApiModelProperty(value="副标题",name="subTitle") + private String subTitle; + /**单位**/ + @io.swagger.annotations.ApiModelProperty(value="单位0:钱分,1:小时",name="unit") + private Integer unit; + /**须知**/ + @io.swagger.annotations.ApiModelProperty(value="须知",name="detail") + private String detail; + /**购买须知**/ + @io.swagger.annotations.ApiModelProperty(value="购买须知",name="remark") + private String remark; + + /**面额**/ + @io.swagger.annotations.ApiModelProperty(value = "面额", name = "price") + private Integer price; + /**购买金额**/ + @io.swagger.annotations.ApiModelProperty(value = "购买金额", name = "salePrice") + private Integer salePrice; + + + /**购买人ID*/ + @io.swagger.annotations.ApiModelProperty(value = "购买人ID", name = "cUserId") + private Long cUserId; + /**持有者ID*/ + @io.swagger.annotations.ApiModelProperty(value = "持有者ID", name = "ownerId") + private Long ownerId; + /**该订单对应券的实际过期时间**/ + @io.swagger.annotations.ApiModelProperty(value = "该订单对应券的实际过期时间 ", name = "expiredTime") + private Date expiredTime; + + + /**购买人昵称*/ + @io.swagger.annotations.ApiModelProperty(value="购买人昵称",name="cNickName") + private String cNickName; + /**持有人昵称*/ + @io.swagger.annotations.ApiModelProperty(value="持有人昵称",name="oNickName") + private String oNickName; + + /**持有人绑定的手机号**/ + @io.swagger.annotations.ApiModelProperty(value="持有人绑定的手机号",name="oPhone") + private String oPhone; + + @Transient + protected List statusS; + + @Transient + protected String statusStr; +} diff --git a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java index 067da1f61..9f5b6d5b1 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/WxCardInfoMapper.java @@ -3,10 +3,13 @@ package com.iformall.mapper; import java.util.*; import com.iformall.common.CommonMapper; import com.iformall.domain.po.WxCardInfo; +import com.iformall.domain.vo.WxCardVo; public interface WxCardInfoMapper extends CommonMapper { List findList(WxCardInfo wxCardInfo); + + List findVoList(WxCardVo wxCardVo); diff --git a/mallinkService/src/main/java/com/iformall/service/WxCardInfoService.java b/mallinkService/src/main/java/com/iformall/service/WxCardInfoService.java index 8ad750479..64ba1ecbe 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCardInfoService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCardInfoService.java @@ -2,6 +2,7 @@ package com.iformall.service; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCardInfo; +import com.iformall.domain.vo.WxCardVo; public interface WxCardInfoService { @@ -13,7 +14,7 @@ public interface WxCardInfoService { * @param pageSize * @return */ - PageInfo listAsPage(WxCardInfo record, Integer pageIndex, Integer pageSize); + PageInfo listAsPage(WxCardVo record, Integer pageIndex, Integer pageSize); /** * 根据Id获得实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java index c0b1db35e..c157a56c2 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardInfoServiceImpl.java @@ -3,6 +3,7 @@ package com.iformall.service.impl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.iformall.domain.po.WxCardInfo; +import com.iformall.domain.vo.WxCardVo; import com.iformall.mapper.WxCardInfoMapper; import com.iformall.service.WxCardInfoService; import org.springframework.beans.factory.annotation.Autowired; @@ -17,8 +18,8 @@ public class WxCardInfoServiceImpl implements WxCardInfoService { @Override - public PageInfo listAsPage(WxCardInfo record, Integer pageIndex, Integer pageSize) { - return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardInfoMapper.findList(record)); + public PageInfo listAsPage(WxCardVo record, Integer pageIndex, Integer pageSize) { + return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCardInfoMapper.findVoList(record)); } @Override diff --git a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml index 6122e560d..32de4076a 100644 --- a/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardInfoMapper.xml @@ -71,6 +71,116 @@ select from wx_card_info + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ci.`id`,ci.`tenant_id`,ci.`coupon_id`,ci.`transaction_id`,ci.`amount`,ci.`sale_amount`,ci.`remaining_amount`,ci.`service_fee_amount`,ci.`share_fee_amount`,ci.`remaining_share_fee_amount`, + ci.`create_date`,ci.`update_date`, + c.`cover_img`, c.`title`, c.`sub_title`, c.`detail`, c.`unit`, c.`remark`, c.`sale_price`, c.`price`, c.`status` + co.`c_user_id`, co.`owner_id`, co.`expired_time`, + cu.`nick_name` as c_nick_name, ow.`nick_name` as o_nick_name, ow.`phone` as o_phone + + + + where 1 = 1 + + and ci.`id` = #{id} + + + and ci.`tenant_id` = #{tenantId} + + + and ci.`coupon_id` = #{couponId} + + + and ci.`transaction_id` = #{transactionId} + + + and ci.`amount` = #{amount} + + + and ci.`sale_amount` = #{saleAmount} + + + and ci.`remaining_amount` = #{remainingAmount} + + + and ci.`service_fee_amount` = #{serviceFeeAmount} + + + and ci.`share_fee_amount` = #{shareFeeAmount} + + + and ci.`remaining_share_fee_amount` = #{remainingShareFeeAmount} + + + and ci.`create_date` = #{createDate} + + + and ci.`update_date` = #{updateDate} + + + and `status` = #{status} + + + and o_phone = #{oPhone} + + + and `status` in in + + #{sItem} + + + + and ci.id in + + #{idItem} + + + order by ci.id desc + + + diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index 244db2d9f..bcec1d0d7 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -166,7 +166,7 @@ order by ${sortColumns} - select from wx_merchant_subsidy ms left join wx_coupon_order co on co.id = ms.coupon_order_id