Bläddra i källkod

[A端][新增]:订单过滤器,订单导出过滤生效

release_toaliyun_real
hupeng 7 år sedan
förälder
incheckning
2c5411dab1
6 ändrade filer med 87 tillägg och 62 borttagningar
  1. +40
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java
  2. +25
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java
  4. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java
  5. +5
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  6. +13
    -47
      mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml

+ 40
- 6
mallinkAdmin/src/main/java/com/iformall/controller/WxCouponOrderController.java Visa fil

@@ -6,6 +6,7 @@ import com.iformall.common.ResultData;
import com.iformall.config.PayProperty;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCouponOrder;
import com.iformall.domain.vo.WxCouponOrderBVo;
import com.iformall.enums.EnumAppType;
import com.iformall.enums.EnumRefundWay;
import com.iformall.exception.MallinkException;
@@ -24,6 +25,8 @@ import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.Map;

@RestController
@@ -49,18 +52,49 @@ public class WxCouponOrderController 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 list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) {
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrder();
public ResultData list(@ModelAttribute WxCouponOrderBVo wxCouponOrder, Integer pageNum, Integer pageSize) {
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderBVo();
wxCouponOrder.setTenantId(getTenantId());
wxCouponOrder.setSortColumns(WxCouponOrder.Field.Id_DESC);
ResultData rd = wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize);
return rd;
return wxCouponOrderService.listAdminAsPage(wxCouponOrder, pageNum, pageSize);
}

@RequestMapping("/exportData")
public void exportData(HttpServletRequest request, HttpServletResponse response) {
public void exportData(
@RequestParam("endDate") String endDate,
@RequestParam("startDate") String startDate,
@RequestParam("merchantName") String merchantName,
@RequestParam("couponOrderStatus") String couponOrderStatus,
@RequestParam("id") String id,
HttpServletRequest request, HttpServletResponse response) {

wxCouponOrderService.exportData(request, response, getTenantId());
WxCouponOrderBVo wxCouponOrder = new WxCouponOrderBVo();
wxCouponOrder.setTenantId(getTenantId());
wxCouponOrder.setMerchantName(merchantName);
try {
wxCouponOrder.setId(Long.valueOf(id));
}catch (Exception e){
wxCouponOrder.setId(null);
}
try {
wxCouponOrder.setCouponOrderStatus(Integer.valueOf(couponOrderStatus));
}catch (Exception e){
wxCouponOrder.setCouponOrderStatus(null);
}

SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
try {
wxCouponOrder.setStartDate( sdf.parse(startDate));
} catch (Exception e) {
wxCouponOrder.setStartDate(null);
}
try {
wxCouponOrder.setEndDate( sdf.parse(endDate));
} catch (Exception e) {
wxCouponOrder.setEndDate(null);
}

wxCouponOrderService.exportData(request, response, wxCouponOrder);

}



+ 25
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxCouponOrderBVo.java Visa fil

@@ -120,6 +120,31 @@ public class WxCouponOrderBVo extends WxCouponOrder{
@Excel(name="面额",width = 20,orderNum = "2")
private String priceStr;

@Transient
private Date startDate;

@Transient
private Date endDate;


public Date getStartDate() {

return startDate;
}

public void setStartDate(Date startDate) {
this.startDate = startDate;
}

public Date getEndDate() {
return endDate;
}

public void setEndDate(Date endDate) {
this.endDate = endDate;
}


public String getTenantId() {
return tenantId;
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java Visa fil

@@ -25,7 +25,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> {
WxCouponOrderCVo selectDetailOfUser(Map paramMap);

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

List<WxCouponOrderCarCVo> findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder);



+ 3
- 2
mallinkService/src/main/java/com/iformall/service/WxCouponOrderService.java Visa fil

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

import com.iformall.domain.vo.WxCouponOrderBVo;
import com.iformall.domain.vo.WxCouponOrderCVo;
import com.iformall.domain.vo.WxCouponOrderCarCVo;

@@ -132,9 +133,9 @@ public interface WxCouponOrderService {
* @param pageSize
* @return
*/
ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize);
ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrder, Integer pageIndex, Integer pageSize);

void exportData(HttpServletRequest request, HttpServletResponse response, String tenantId);
void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponOrderBVo wxCouponOrder);

/**


+ 5
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Visa fil

@@ -248,18 +248,17 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
}

@Override
public ResultData listAdminAsPage(WxCouponOrder wxCouponOrder, Integer pageIndex, Integer pageSize) {
PageInfo<WxCouponOrderBVo> pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrder));
public ResultData listAdminAsPage(WxCouponOrderBVo wxCouponOrderBVo, Integer pageIndex, Integer pageSize) {
PageInfo<WxCouponOrderBVo> pageInfo= PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfAdmin(wxCouponOrderBVo));
return new ResultData(pageInfo);
}

@Override
public void exportData(HttpServletRequest request, HttpServletResponse response, String tenantId) {
WxCouponOrder wxCouponOrder = new WxCouponOrder();
wxCouponOrder.setTenantId(tenantId);
public void exportData(HttpServletRequest request, HttpServletResponse response, WxCouponOrderBVo wxCouponOrder) {

List<WxCouponOrderBVo> list = wxCouponOrderMapper.findListOfAdmin(wxCouponOrder);
WxMall wxMall = new WxMall();
wxMall.setTenantId(tenantId);
wxMall.setTenantId(wxCouponOrder.getTenantId());
wxMall = wxMallMapper.findList(wxMall).get(0);
String filepath = Constant.fileDirectory;
File savefile = new File(filepath);


+ 13
- 47
mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml Visa fil

@@ -185,14 +185,14 @@
order by co.update_date desc
</select>

<select id="findListOfAdmin" parameterType="com.iformall.domain.po.WxCouponOrder" resultMap="BVoResultMap">
<select id="findListOfAdmin" parameterType="com.iformall.domain.vo.WxCouponOrderBVo" resultMap="BVoResultMap">
select <include refid="allAdminCouponOrderColumns" />
from wx_coupon_order co
left join wx_order o on o.id = co.order_id
left join wx_coupon c on co.coupon_id = c.id
left join wx_c_user cu on cu.id = co.c_user_id
left join wx_merchant_b_user bu on bu.id = co.b_user_id
left join wx_merchant m on o.merchant_id = m.id
inner JOIN wx_order o on o.id = co.order_id
inner JOIN wx_coupon c on co.coupon_id = c.id
inner JOIN wx_c_user cu on cu.id = co.c_user_id
inner JOIN wx_merchant m on o.merchant_id = m.id
left join wx_merchant_b_user bu on co.b_user_id = bu.id
where 1 = 1
<if test=" null != id ">
and co.id = #{id}
@@ -202,57 +202,23 @@
and co.tenant_id = #{tenantId}
</if>

<if test=" null != couponId ">
and co.coupon_id = #{couponId}
</if>

<if test=" null != cUserId ">
and co.c_user_id = #{cUserId}

</if>

<if test=" null != bUserId ">
and co.b_user_id = #{bUserId}

</if>

<if test=" null != orderId ">
and co.order_id = #{orderId}

</if>

<if test=" null != expiredTime ">
and co.expired_time = #{expiredTime}

</if>

<if test=" null != couponOrderStatus ">
and co.coupon_order_status = #{couponOrderStatus}

</if>

<if test=" null != createDate ">
and co.create_date = #{createDate}

<if test=" null != merchantName ">
and m.name like concat('%', #{merchantName},'%')
</if>

<if test=" null != updateDate ">
and co.update_date = #{updateDate}

<if test="startDate != null">
AND co.create_date &gt; #{startDate,jdbcType=TIMESTAMP}
</if>

<if test=" null != couponPrice ">
and co.coupon_price = #{couponPrice}

</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
#{idItem}
</foreach>
<if test="endDate != null">
AND co.create_date &lt; #{endDate,jdbcType=TIMESTAMP}
</if>
<if test=" null != sortColumns"> order by ${sortColumns} </if>

<if test=" null != sortColumns"> order by ${sortColumns} </if>

</select>



Laddar…
Avbryt
Spara