Browse Source

add coupon_order controller

release_toaliyun_real
masterspirit 7 years ago
parent
commit
28c8bd66f6
2 changed files with 90 additions and 25 deletions
  1. +68
    -0
      mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java
  2. +22
    -25
      mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java

+ 68
- 0
mallinkAdmin/src/main/java/com/simple/controller/WxCouponOrderController.java View File

@@ -0,0 +1,68 @@
package com.simple.controller;

import com.github.pagehelper.PageInfo;
import com.simple.common.Result;
import com.simple.common.ResultData;
import com.simple.domain.po.WxCouponOrder;
import com.simple.service.WxCouponOrderService;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.apache.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@RestController
@RequestMapping("wxCouponOrder")
public class WxCouponOrderController extends BaseController
{
@Autowired
private WxCouponOrderService wxCouponOrderService;

private Logger logger = Logger.getLogger(WxCouponOrderController.class);
@ApiOperation("分页列表接口")
@GetMapping("list")
@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 (null == wxCouponOrder) wxCouponOrder = new WxCouponOrder();
final PageInfo<WxCouponOrder> page = wxCouponOrderService.listAsPage(wxCouponOrder, pageNum, pageSize);
return new ResultData(page);
}

@ApiOperation("新增接口")
@PostMapping("add")
public ResultData add(@RequestBody WxCouponOrder wxCouponOrder) {
//Assert.notNull(wxCouponOrder.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxCouponOrderService.saveOrUpdate(wxCouponOrder);
return new ResultData();
}

@ApiOperation("根据id更新接口")
@PostMapping("update")
public ResultData update(@RequestBody WxCouponOrder wxCouponOrder) {
wxCouponOrderService.saveOrUpdate(wxCouponOrder);
return new ResultData();
}

@ApiOperation("根据id删除接口")
@GetMapping("/del")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData delete(Long id) {
wxCouponOrderService.deleteById(id);
return new ResultData(Result.SUCCESS, "删除成功", null);
}
@ApiOperation("根据id查询接口")
@GetMapping("/findById")
@ApiImplicitParam(name="id",value="id",dataType="Long", paramType = "query",required=true)
public ResultData findById(Long id) {
return new ResultData(Result.SUCCESS,"查询成功",wxCouponOrderService.getById(id));
}
}

+ 22
- 25
mallinkService/src/main/java/com/simple/service/impl/WxUserCouponServiceImpl.java View File

@@ -1,6 +1,7 @@
package com.simple.service.impl;
import com.simple.domain.dto.WxUserCouponDto;
import com.simple.domain.po.WxCoupon;
import com.simple.domain.po.WxCouponOrder;
import com.simple.domain.po.WxOrder;
import com.simple.mapper.WxCouponMapper;
import com.simple.mapper.WxCouponOrderMapper;
@@ -36,35 +37,31 @@ public class WxUserCouponServiceImpl implements WxUserCouponService {
//TODO 待测试优化
List<WxUserCouponDto> wxUserCoupons = new ArrayList<>();
//查询订单表
WxOrder wxOrder = new WxOrder();
wxOrder.setCUserId(userId);
/*
wxOrder.setCouponStatus(status);
List<WxOrder> orders = wxOrderService.findList(wxOrder);
List<String> ids = orders.stream().map(p->p.getCouponId()+"").distinct().collect(Collectors.toList());
if(ids.size()>0){
//查询WxCoupon
WxCoupon wxCoupon = new WxCoupon();
wxCoupon.setIds(ids);
List<WxCoupon> wxCoupons = wxCouponMapper.findList(wxCoupon);
Map<Long,String> couponNamesMap = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId,p->p.getTitle()));
for (WxOrder temp:orders) {
wxUserCoupons.add(getWxUserCoupon(temp,couponNamesMap.get(temp.getCouponId())));
}
WxCouponOrder wxCouponOrder = new WxCouponOrder();
wxCouponOrder.setCUserId(userId);
wxCouponOrder.setCouponOrderStatus(status);//状态:0,待使用 1,已核销 2,已过期 3,已退款
List<WxCouponOrder> wxCouponOrders = wxCouponOrderMapper.findList(wxCouponOrder);
if(wxCouponOrders.isEmpty()){
return wxUserCoupons;
}
List<Long> ids = wxCouponOrders.stream().map(p->p.getCouponId()).distinct().collect(Collectors.toList());
WxCoupon wxCoupon = new WxCoupon();
wxCoupon.setIds(ids);
List<WxCoupon> wxCoupons = wxCouponMapper.findList(wxCoupon);
Map<Long,WxCoupon> couponNamesMap = wxCoupons.stream().collect(Collectors.toMap(WxCoupon::getId,p->p));
for (WxCouponOrder temp:wxCouponOrders) {
wxUserCoupons.add(getWxUserCoupon(temp,couponNamesMap.get(temp.getCouponId())));
}
*/
return wxUserCoupons;
}
public WxUserCouponDto getWxUserCoupon(WxOrder wxOrder, String title){
public WxUserCouponDto getWxUserCoupon(WxCouponOrder wxCouponOrder, WxCoupon wxCoupon){
WxUserCouponDto wxUserCoupon = new WxUserCouponDto();
wxUserCoupon.setOrderId(wxOrder.getId());
wxUserCoupon.setcUserId(wxOrder.getCUserId());
/*
wxUserCoupon.setCouponId(wxOrder.getCouponId());
wxUserCoupon.setCouponStatus(wxOrder.getCouponStatus());
wxUserCoupon.setValidDate(wxOrder.getValidDate());
*/
wxUserCoupon.setCouponTitle(title);
wxUserCoupon.setOrderId(wxCouponOrder.getId());
wxUserCoupon.setcUserId(wxCouponOrder.getCUserId());
wxUserCoupon.setCouponStatus(wxCouponOrder.getCouponOrderStatus());
wxUserCoupon.setCouponId(wxCouponOrder.getCouponId());
wxUserCoupon.setValidDate(wxCouponOrder.getExpiredTime());
wxUserCoupon.setCouponTitle(wxCoupon.getTitle());
return wxUserCoupon;
}
}


Loading…
Cancel
Save