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

[CouponOrder停车券查询][新增]:支持停车券查询

release_toaliyun_real
Stormeye.Wu 7 лет назад
Родитель
Сommit
6ad682cd62
4 измененных файлов: 11 добавлений и 7 удалений
  1. +2
    -2
      mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java
  2. +4
    -3
      mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java
  3. +1
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java
  4. +4
    -1
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 2
- 2
mallinkCApi/src/main/java/com/simple/controller/WxCouponOrderController.java Просмотреть файл

@@ -65,12 +65,12 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
})
public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) {
public ResultData list(@ModelAttribute WxCouponOrderCVo wxCouponOrder, Integer pageNum, Integer pageSize) {

if(pageNum == null || pageSize == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder();
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo();
wxCouponOrder.setCUserId(getUser().getId());
if (wxCouponOrder.getCouponOrderStatus() == null)
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC);


+ 4
- 3
mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java Просмотреть файл

@@ -11,6 +11,7 @@ import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;

import com.simple.domain.vo.WxCouponOrderCVo;
import org.apache.ibatis.annotations.Param;

public interface WxCouponOrderService {
@@ -81,15 +82,15 @@ public interface WxCouponOrderService {
/**
* C用户查券list
*
* @param bUserId C端用户
* @param record C端用户
*/

ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize);
ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize);

/**
* C用户查券详情
*
* @param bUserId C端用户
* @param cUserId C端用户
*/
ResultData detailCUserVo(Long cUserId, String couponOrderId);



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

@@ -161,7 +161,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

@Override
public ResultData listCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) {
public ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize) {

return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record)));
}


+ 4
- 1
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Просмотреть файл

@@ -328,7 +328,7 @@
</resultMap>


<select id="findListOfCUser" parameterType="com.simple.domain.po.WxCouponOrder" resultMap="CVoResultMap">
<select id="findListOfCUser" parameterType="com.simple.domain.vo.WxCouponOrderCVo" resultMap="CVoResultMap">
select <include refid="allCUserCouponOrderListColumns" />
from wx_coupon_order c,wx_coupon co,wx_merchant m
where 1=1
@@ -340,6 +340,9 @@
<if test="tenantId != null">
and c.tenant_id = #{tenantId}
</if>
<if test="type != null">
and co.type = #{type}
</if>
<if test="couponOrderStatus != null">
AND c.coupon_order_status = #{couponOrderStatus}
</if>


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