From 29223319bee5397b6e5ca6f22a7aeda4bc33f91a Mon Sep 17 00:00:00 2001 From: "Stormeye.Wu" Date: Mon, 3 Sep 2018 22:47:29 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=81=9C=E8=BD=A6=E5=88=B8=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3][=E6=96=B0=E5=A2=9E]:=E5=81=9C=E8=BD=A6?= =?UTF-8?q?=E5=88=B8=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../simple/controller/WxCarController.java | 34 ++++++- .../simple/domain/vo/WxCouponOrderCarCVo.java | 96 +++++++++++++++++++ .../simple/mapper/WxCouponOrderMapper.java | 4 +- .../simple/service/WxCouponOrderService.java | 9 ++ .../impl/WxCouponOrderServiceImpl.java | 6 ++ .../resources/mapper/WxCouponOrderMapper.xml | 70 ++++++++++++++ 6 files changed, 215 insertions(+), 4 deletions(-) create mode 100644 mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCarCVo.java diff --git a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java index 7895c05f8..a9d799dfc 100644 --- a/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java +++ b/mallinkCApi/src/main/java/com/simple/controller/WxCarController.java @@ -3,16 +3,17 @@ package com.simple.controller; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.simple.annotation.AuthIgnore; import com.simple.common.ErrorCode; import com.simple.common.Result; import com.simple.common.ResultData; import com.simple.domain.po.*; +import com.simple.domain.vo.WxCouponOrderCarCVo; import com.simple.enums.EnumCarVendor; +import com.simple.enums.EnumCouponOrderStatus; import com.simple.enums.EnumETCPCode; import com.simple.enums.EnumTJDCode; -import com.simple.service.WxCUserCarService; -import com.simple.service.WxMerchantService; -import com.simple.service.WxParkService; +import com.simple.service.*; import com.simple.utils.ETCPUtil; import com.simple.utils.TJDCarUtil; import io.swagger.annotations.Api; @@ -49,6 +50,9 @@ public class WxCarController extends BaseController @Autowired WxMerchantService wxMerchantService; + @Autowired + WxCouponOrderService wxCouponOrderService; + private WxPark getCurrentPark(WxCUser user) { WxPark parkQ = new WxPark(); parkQ.setTenantId(user.getTenantId()); @@ -635,4 +639,28 @@ public class WxCarController extends BaseController } return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "优免券领取失败"); } + + @ApiOperation("券包分页列表接口") + @GetMapping("couponOrderList") + @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 WxCouponOrderCarCVo wxCouponOrder, Integer pageNum, Integer pageSize) { + + if(pageNum == null || pageSize == null) { + return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + } + if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); + WxCUser user = getUser(); + wxCouponOrder.setTenantId(user.getTenantId()); + wxCouponOrder.setCUserId(user.getId()); + if (wxCouponOrder.getCouponOrderStatus() == null) + wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) + wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); + else + wxCouponOrder.setSortColumns(WxCouponOrder.Field.UpdateDate_DESC); + return wxCouponOrderService.carlistCUserVoAsPage(wxCouponOrder, pageNum, pageSize); + } } diff --git a/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCarCVo.java b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCarCVo.java new file mode 100644 index 000000000..a2fcb2eb8 --- /dev/null +++ b/mallinkService/src/main/java/com/simple/domain/vo/WxCouponOrderCarCVo.java @@ -0,0 +1,96 @@ +package com.simple.domain.vo; + +import com.simple.domain.po.WxCouponOrder; + +import javax.persistence.Id; +import javax.persistence.Transient; +import java.util.Date; +import java.util.List; + +public class WxCouponOrderCarCVo extends WxCouponOrderCVo { + + /** + * + */ + private static final long serialVersionUID = 6687954932922444531L; + + /*couponFreeId**/ + @io.swagger.annotations.ApiModelProperty(value="couponFreeId",name="couponFreeId") + private Integer couponFreeId; + + public Integer getCouponFreeId() { + return couponFreeId; + } + + public void setCouponFreeId(Integer couponFreeId) { + this.couponFreeId = couponFreeId; + } + + public static enum Field { + Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), + TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), + CouponId_ASC("`coupon_id` ASC"), couponId_DESC("`coupon_id` DESC"), + CUserId_ASC("`c_user_id` ASC"), CUserId_DESC("`c_user_id` DESC"), + BUserId_ASC("`b_user_id` ASC"), BUserId_DESC("`b_user_id` DESC"), + OrderId_ASC("`order_id` ASC"), OrderId_DESC("`order_id` DESC"), + ExpiredTime_ASC("`expired_iime` ASC"), ExpiredTime_DESC("`expired_iime` DESC"), + CouponOrderStatus_ASC("`coupon_order_status` ASC"), CouponOrderStatus_DESC("`coupon_order_status` DESC"), + CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC"), + UpdateDate_ASC("`update_date` ASC"), UpdateDate_DESC("`update_date` DESC"), + CouponPrice_ASC("`coupon_price` ASC"), CouponPrice_DESC("`coupon_price` DESC"), + CouponFreeId_ASC("`coupon_free_id` ASC"), CouponFreeId_DESC("`coupon_free_id` DESC"); + private String value; + + Field(String value) { + this.value = value; + } + + public String getValue() { + return value; + } + + public void setCol(String value) { + this.value = value; + } + + @Override + public String toString() { + return this.getValue(); + } + } + + public void setSortColumns(WxCouponOrder.Field... fields) { + if (fields == null || fields.length == 0) { + return; + } + for (int k = 0; k < fields.length; k++) { + if (fields[k] == null) { + return; + } + } + StringBuilder sb = new StringBuilder(fields[0].toString()); + for (int k = 1; k < fields.length; k++) { + sb.append(","); + sb.append(fields[k].toString()); + } + + this.sortColumns = sb.toString(); + } + + public void setSortColumns(String sortColumns) { + if (sortColumns == null || "".equals(sortColumns.trim())) { + return; + } + if (sortColumns.contains(",")) { + String[] cols = sortColumns.split(","); + List fList = new java.util.ArrayList(); + for (int k = 0; k < cols.length; k++) { + fList.add(WxCouponOrder.Field.valueOf(cols[k])); + } + this.setSortColumns(fList.toArray(new WxCouponOrder.Field[fList.size()])); + } else { + this.setSortColumns(WxCouponOrder.Field.valueOf(sortColumns)); + } + } + +} diff --git a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java index 048817aca..b492bfff5 100644 --- a/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java +++ b/mallinkService/src/main/java/com/simple/mapper/WxCouponOrderMapper.java @@ -23,9 +23,11 @@ public interface WxCouponOrderMapper extends CommonMapper { WxCouponOrderCVo selectDetailOfUser(Map paramMap); - List findListOfCUser(WxCouponOrder wxCouponOrder); + List findListOfCUser(WxCouponOrderCVo wxCouponOrder); List findListOfAdmin(WxCouponOrder wxCouponOrder); + List findCarListOfCUser(WxCouponOrderCarCVo wxCouponOrder); + //营销报表 券数据图表 List couponDataMap(HashMap params); diff --git a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java index 59a66cd60..67de5aa73 100644 --- a/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java +++ b/mallinkService/src/main/java/com/simple/service/WxCouponOrderService.java @@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.simple.domain.vo.WxCouponOrderCVo; +import com.simple.domain.vo.WxCouponOrderCarCVo; import org.apache.ibatis.annotations.Param; public interface WxCouponOrderService { @@ -78,6 +79,14 @@ public interface WxCouponOrderService { ResultData listCUserVoAsPage(WxCouponOrderCVo record, Integer pageIndex, Integer pageSize); + /** + * C用户查券carlist + * + * @param record C端用户 + */ + + ResultData carlistCUserVoAsPage(WxCouponOrderCarCVo record, Integer pageIndex, Integer pageSize); + /** * C用户查券详情 * diff --git a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java index fc7db503a..e89833f8e 100644 --- a/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/simple/service/impl/WxCouponOrderServiceImpl.java @@ -11,6 +11,7 @@ import com.simple.domain.po.*; import com.simple.domain.vo.CUserDateAmountVo; import com.simple.domain.vo.WxCouponOrderBVo; import com.simple.domain.vo.WxCouponOrderCVo; +import com.simple.domain.vo.WxCouponOrderCarCVo; import com.simple.enums.EnumCouponOrderStatus; import com.simple.enums.EnumRefundStatus; import com.simple.exception.MallinkException; @@ -165,6 +166,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findListOfCUser(record))); } + @Override + public ResultData carlistCUserVoAsPage(WxCouponOrderCarCVo record, Integer pageIndex, Integer pageSize) { + return new ResultData(PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCouponOrderMapper.findCarListOfCUser(record))); + } + @Override public ResultData detailCUserVo(Long cUserId, String couponOrderId) { WxCUser wxCuser = wxCUserMapper.selectByPrimaryKey(cUserId); diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index 631b09e1f..fa11e5036 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -440,4 +440,74 @@ where expired_time < now() and coupon_price > 0 and coupon_order_status = 0 + + c.id,c.expired_time,c.coupon_order_status,c.create_date,c.update_date,c.coupon_price, + co.cover_img,co.title,co.sub_title,co.sale_price,co.use_price,co.price, + m.name,json_extract(car.vendor_params,'$.id') as coupon_free_id + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file