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

[A端][需求]:调整BC两端的卡券订单支持多商户

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
4dcbcbb108
6 измененных файлов: 41 добавлений и 47 удалений
  1. +4
    -5
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  2. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java
  4. +10
    -10
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  5. +7
    -7
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  6. +17
    -22
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 4
- 5
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Просмотреть файл

@@ -648,13 +648,12 @@ public class WxCarController extends BaseController {
} }


WxCouponOrderCarCVo userCar = null; WxCouponOrderCarCVo userCar = null;
WxCouponOrderCarCVo userCarQ = new WxCouponOrderCarCVo();
WxCouponOrder userCarQ = new WxCouponOrder();
userCarQ.setTenantId(user.getTenantId()); userCarQ.setTenantId(user.getTenantId());
userCarQ.setCUserId(user.getId()); userCarQ.setCUserId(user.getId());
userCarQ.setType(EnumCouponType.COUPON_TINGCHE.getCode());
userCarQ.setId(couponOrderId); userCarQ.setId(couponOrderId);
userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode());
List<WxCouponOrderCarCVo> list = wxCouponOrderService.carlistCUserVo(userCarQ);
List<WxCouponOrderCarCVo> list = wxCouponOrderService.carListCUserVo(userCarQ);
if (list.size() > 0) { if (list.size() > 0) {
userCar = list.get(0); userCar = list.get(0);
} }
@@ -704,7 +703,7 @@ public class WxCarController extends BaseController {
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
}) })
public ResultData list(@ModelAttribute WxCouponOrderCarCVo wxCouponOrder, Integer pageNum, Integer pageSize) {
public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) {


if(pageNum == null || pageSize == null) { if(pageNum == null || pageSize == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
@@ -719,7 +718,7 @@ public class WxCarController extends BaseController {
wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC);
else else
wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC);
return wxCouponOrderService.carlistCUserVoAsPage(wxCouponOrder, pageNum, pageSize);
return wxCouponOrderService.carListCUserVoAsPage(wxCouponOrder, pageNum, pageSize);
} }


@ApiOperation(value = "停车场状态") @ApiOperation(value = "停车场状态")


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

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


if (pageNum == null || pageSize == null) { if (pageNum == null || pageSize == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);


+ 2
- 2
mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java Просмотреть файл

@@ -17,7 +17,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> {




Integer dayCountCarList(Map params); Integer dayCountCarList(Map params);
List<WxCouponOrderCarCVo> findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder);
List<WxCouponOrderCarCVo> findCarListOfCUser(WxCouponOrder wxCouponOrder);




List<WxCouponOrder> findListOfOrderedByDate(Map dateMap); List<WxCouponOrder> findListOfOrderedByDate(Map dateMap);
@@ -28,7 +28,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> {


WxCouponOrderCVo findDetail(@Param("id")Long id); WxCouponOrderCVo findDetail(@Param("id")Long id);


List<WxCouponOrderCVo> findListOfCUser(WxCouponOrderCVo wxCouponOrder);
List<WxCouponOrderCVo> findListOfCUser(WxCouponOrder wxCouponOrder);
List<WxCouponOrderBVo> findListOfAdmin(WxCouponOrderBVo wxCouponOrder); List<WxCouponOrderBVo> findListOfAdmin(WxCouponOrderBVo wxCouponOrder);


/** /**


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

@@ -101,7 +101,14 @@ public interface WxCouponOrderService {
* @param record C端用户 * @param record C端用户
*/ */


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

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


/** /**
* C用户查券carlist * C用户查券carlist
@@ -109,16 +116,10 @@ public interface WxCouponOrderService {
* @param record C端用户 * @param record C端用户
*/ */


ResultData carlistCUserVoAsPage(WxCouponOrderCarCVo record, Integer pageIndex, Integer pageSize);
ResultData carListCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize);


List<WxCouponOrderCarCVo> carlistCUserVo(WxCouponOrderCarCVo record);
List<WxCouponOrderCarCVo> carListCUserVo(WxCouponOrder record);


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


/** /**
* B用户查券详情 * B用户查券详情
@@ -127,7 +128,6 @@ public interface WxCouponOrderService {
*/ */
ResultData detailBUserVo(Long bUserId, String couponOrderId); ResultData detailBUserVo(Long bUserId, String couponOrderId);



/** /**
* A端查询分页列表 * A端查询分页列表
* *


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

@@ -128,7 +128,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
logger.error("商户不存在:" + bUserId); logger.error("商户不存在:" + bUserId);
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND);
} }
/*
SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd");
String dateString; String dateString;
Date startDate; Date startDate;
@@ -153,10 +153,10 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
cal.add(Calendar.DATE, 1); cal.add(Calendar.DATE, 1);
endDate = cal.getTime(); endDate = cal.getTime();
} }
*/
Map dateMap = new HashMap(); Map dateMap = new HashMap();
// dateMap.put("startDate", startDate);
// dateMap.put("endDate", endDate);
dateMap.put("startDate", startDate);
dateMap.put("endDate", endDate);
dateMap.put("merchantId", wxMerchant.getId()); dateMap.put("merchantId", wxMerchant.getId());


Map resultMap = new HashMap(); Map resultMap = new HashMap();
@@ -179,7 +179,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
} }


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


return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record)));
} }
@@ -200,12 +200,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {




@Override @Override
public ResultData carlistCUserVoAsPage(WxCouponOrderCarCVo record, Integer pageIndex, Integer pageSize) {
public ResultData carListCUserVoAsPage(WxCouponOrder record, Integer pageIndex, Integer pageSize) {
return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findCarListOfCUser(record))); return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findCarListOfCUser(record)));
} }


@Override @Override
public List<WxCouponOrderCarCVo> carlistCUserVo(WxCouponOrderCarCVo record) {
public List<WxCouponOrderCarCVo> carListCUserVo(WxCouponOrder record) {
return wxCouponOrderMapper.findCarListOfCUser(record); return wxCouponOrderMapper.findCarListOfCUser(record);
} }




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

@@ -423,9 +423,16 @@


<select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap"> <select id="findListOfOrderedByDate" parameterType="map" resultMap="BaseResultMap">
select <include refid="allCouponOrderColumns" /> select <include refid="allCouponOrderColumns" />
from wx_coupon_order co,wx_order o
where o.id = co.order_id
and o.merchant_id = #{merchantId}
from wx_coupon_order co,wx_coupon_merchant cm,
(select tco.id as tcoid,
(select count(*) from wx_coupon_merchant tcm
where tcm.product_id = tco.coupon_id)
as mc
from wx_coupon_order tco) com
where com.mc = 1
and com.tcoid = co.id
and cm.merchant_id = #{merchantId}
and cm.product_id = co.coupon_id
<if test="startDate != null"> <if test="startDate != null">
AND co.create_date &gt; #{startDate,jdbcType=TIMESTAMP} AND co.create_date &gt; #{startDate,jdbcType=TIMESTAMP}
</if> </if>
@@ -436,9 +443,9 @@


<select id="findListOfVerifiedByDate" parameterType="map" resultMap="BaseResultMap"> <select id="findListOfVerifiedByDate" parameterType="map" resultMap="BaseResultMap">
select <include refid="allCouponOrderColumns" /> select <include refid="allCouponOrderColumns" />
from wx_coupon_order co,wx_order o
where o.id = co.order_id
and o.merchant_id = #{merchantId}
from wx_coupon_order co, wx_merchant_b_user mbu
where mbu.id = co.b_user_id
and mbu.merchant_id = #{merchantId}
<if test="startDate != null"> <if test="startDate != null">
AND co.update_date &gt; #{startDate,jdbcType=TIMESTAMP} AND co.update_date &gt; #{startDate,jdbcType=TIMESTAMP}
</if> </if>
@@ -497,18 +504,13 @@
from wx_coupon_order co,wx_coupon c from wx_coupon_order co,wx_coupon c
where 1=1 where 1=1
and co.coupon_id = c.id and co.coupon_id = c.id
and c.type &lt; 5
<if test="cUserId != null"> <if test="cUserId != null">
and co.c_user_id = #{cUserId} and co.c_user_id = #{cUserId}
</if> </if>
<if test="tenantId != null"> <if test="tenantId != null">
and co.tenant_id = #{tenantId} and co.tenant_id = #{tenantId}
</if> </if>
<if test="type != null">
and c.type = #{type}
</if>
<if test="type == null">
and c.type &lt; 5
</if>
<if test="couponOrderStatus != null"> <if test="couponOrderStatus != null">
AND co.coupon_order_status = #{couponOrderStatus} AND co.coupon_order_status = #{couponOrderStatus}
</if> </if>
@@ -524,7 +526,7 @@
</select> </select>


<sql id="allCUserCouponOrderCarListColumns"> <sql id="allCUserCouponOrderCarListColumns">
co.id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
co.id,co.coupon_id,co.expired_time,co.coupon_order_status,co.create_date,co.update_date,co.coupon_price,
c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit, c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.price,c.unit,
json_extract(car.vendor_params,'$.id') as coupon_free_id json_extract(car.vendor_params,'$.id') as coupon_free_id
</sql> </sql>
@@ -555,19 +557,15 @@


<result column="coupon_free_id" jdbcType="INTEGER" property="couponFreeId"/> <result column="coupon_free_id" jdbcType="INTEGER" property="couponFreeId"/>


<collection column="{productId=coupon_id}" property="merchantVoList"
ofType="com.iformall.domain.vo.WxMerchantVo"
javaType="java.util.ArrayList"
select="com.iformall.mapper.WxCouponMerchantMapper.findMerchantVoList" >
</collection>
</resultMap> </resultMap>




<select id="findCarListOfCUser" parameterType="com.iformall.domain.vo.WxCouponOrderCarCVo" resultMap="CCarVoResultMap"> <select id="findCarListOfCUser" parameterType="com.iformall.domain.vo.WxCouponOrderCarCVo" resultMap="CCarVoResultMap">
select <include refid="allCUserCouponOrderCarListColumns" /> select <include refid="allCUserCouponOrderCarListColumns" />
from wx_coupon_order co,wx_coupon c, wx_coupon_car car
from wx_coupon_order co, wx_coupon c, wx_coupon_car car
where co.coupon_id = c.id where co.coupon_id = c.id
and co.coupon_id = car.id and co.coupon_id = car.id
and c.type = 5
<if test="cUserId != null"> <if test="cUserId != null">
and co.c_user_id = #{cUserId} and co.c_user_id = #{cUserId}
</if> </if>
@@ -577,9 +575,6 @@
<if test="id != null"> <if test="id != null">
and co.id = #{id} and co.id = #{id}
</if> </if>
<if test="type != null">
and c.type = #{type}
</if>
<if test="couponOrderStatus != null"> <if test="couponOrderStatus != null">
AND co.coupon_order_status = #{couponOrderStatus} AND co.coupon_order_status = #{couponOrderStatus}
</if> </if>


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