盲票上下架

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -3,6 +3,7 @@ package com.qs.mp.web.controller.api.admin;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.qs.mp.admin.domain.Ticket;
 import com.qs.mp.admin.domain.TicketBox;
 import com.qs.mp.admin.domain.excel.TicketExcel;
@@ -22,6 +23,7 @@ import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.enums.BusinessType;
 import com.qs.mp.common.enums.ChannelRoleEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.enums.TicketTypeEnum;
 import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.system.domain.SysUser;
@@ -73,12 +75,12 @@ public class TicketBoxMgrController extends BaseApiController {
 
 	@Autowired
 	private MapperFacade mapperFacade;
-	
+
 
 	@Value("${wx-channel.appId}")
 	private String channelAppId;
-	
-	
+
+
 	@Value("${mp.exportUrl}")
 	private String exportUrl;
 
@@ -96,7 +98,7 @@ public class TicketBoxMgrController extends BaseApiController {
 
 	/**
 	 * 新增盲票
-	 * 
+	 *
 	 * @param
 	 * @return
 	 */
@@ -115,6 +117,36 @@ public class TicketBoxMgrController extends BaseApiController {
 		return rtn ? AjaxResult.success() : AjaxResult.error("创建失败");
 	}
 
+	/**
+	 * 盲票上下架
+	 *
+	 * @param
+	 * @return
+	 */
+	@ApiOperation(value = "盲票上下架", notes = "管理端盲票上下架")
+	@PostMapping("/put")
+	public AjaxResult putOnOff(@RequestBody TicketBox param) {
+		if (StringUtils.isNotBlank(param.getBoxId()) || param.getStatus() == null) {
+				return AjaxResult.error("参数缺失");
+		}
+		TicketBox ticketBox = ticketBoxService.getById(param.getBoxId());
+		if (param.getStatus() == TicketBoxStatusEnum.PUT_OFF) {
+			if (ticketBox.getStatus() != TicketBoxStatusEnum.PUT_ON) {
+				return AjaxResult.error("当前状态不是已上架，不能下架");
+			}
+			ticketBoxService.update(new LambdaUpdateWrapper<TicketBox>().set(TicketBox::getStatus, TicketBoxStatusEnum.PUT_OFF)
+					.eq(TicketBox::getBoxId, ticketBox.getBoxId()));
+		} else if (param.getStatus() == TicketBoxStatusEnum.PUT_ON) {
+			if (ticketBox.getStatus() != TicketBoxStatusEnum.PUT_OFF && ticketBox.getStatus() != TicketBoxStatusEnum.DONE) {
+				return AjaxResult.error("当前状态不是待上架或已下架，不能上架");
+			}
+			ticketBoxService.update(new LambdaUpdateWrapper<TicketBox>().set(TicketBox::getStatus, TicketBoxStatusEnum.PUT_ON)
+					.eq(TicketBox::getBoxId, ticketBox.getBoxId()));
+		}
+
+		return AjaxResult.success("操作成功");
+	}
+
 	@Log(title = "盲票导出", businessType = BusinessType.EXPORT)
 	@PostMapping("/export")
 	public AjaxResult exportTicket(@RequestBody BathIdParam ids) {
@@ -143,8 +175,8 @@ public class TicketBoxMgrController extends BaseApiController {
 		ExcelUtil<TicketExcel> util = new ExcelUtil<TicketExcel>(TicketExcel.class);
 		return util.exportExcel(excelList, "盲票导出数据", true);
 	}
-	
-	
+
+
     @GetMapping("/importTemplate")
     public AjaxResult importTemplate()
     {
@@ -173,5 +205,5 @@ public class TicketBoxMgrController extends BaseApiController {
 		}
 	}
 
-	
+
 }

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -76,7 +76,7 @@ public class ChannelOrderController extends BaseApiController {
   private ITicketBoxService ticketBoxService;
 
   @Autowired
-  private IUserAddrService channelAddrService;
+  private IUserAddrService userAddrService;
 
   @Autowired
   private MapperFacade mapperFacade;
@@ -136,14 +136,14 @@ public class ChannelOrderController extends BaseApiController {
   @PostMapping("/order/settle")
   @ApiOperation(value = "订单结算" , notes = "购物车里点结算或者单个盲票组商品上点立即购买")
   public AjaxResult settle(@Valid @RequestBody ChannelOrderParam param) {
-    Long channelId = SecurityUtils.getLoginUser().getChannelId();
+    Long userId = SecurityUtils.getLoginUser().getUserId();
 
     ChannelOrderSettleVO orderSettleVO = new ChannelOrderSettleVO();
 
     // 收货地址，如果用户选了地址，则此处不做处理
     if (null == param.getAddrId() || 0 == param.getAddrId()) {
       //读取默认地址
-      UserAddr addr = channelAddrService.getDefaultChannelAddr(channelId);
+      UserAddr addr = userAddrService.getDefaultChannelAddr(userId);
       if (null != addr) {
         orderSettleVO.setAddr(addr);
       }
@@ -178,7 +178,7 @@ public class ChannelOrderController extends BaseApiController {
     orderSettleVO.setPkgNum(pkgNum);
 
     // 缓存订单结算对象
-    redisCache.setCacheObject(RedisKey.build(RedisKey.CHANNEL_ORDER_KEY, channelId), orderSettleVO, 10, TimeUnit.MINUTES);
+    redisCache.setCacheObject(RedisKey.build(RedisKey.CHANNEL_ORDER_KEY, userId), orderSettleVO, 10, TimeUnit.MINUTES);
     return AjaxResult.success(orderSettleVO);
   }
 

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -24,15 +24,22 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.redis.RedisCache;
 import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.CouponUseAreaEnum;
+import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.framework.redis.RedisKey;
 import com.qs.mp.pay.service.IWalletService;
+import com.qs.mp.user.domain.UserAddr;
+import com.qs.mp.user.domain.UserPrizeStorage;
 import com.qs.mp.user.domain.UserTicketOrder;
+import com.qs.mp.user.domain.param.DeliverOrderParam;
 import com.qs.mp.user.domain.param.TicketOrderParam;
+import com.qs.mp.user.domain.vo.DeliverOrderSettleVO;
 import com.qs.mp.user.domain.vo.TicketOrderSettleVO;
 import com.qs.mp.user.domain.vo.UserCouponVO;
+import com.qs.mp.user.service.IUserAddrService;
 import com.qs.mp.user.service.IUserCouponService;
+import com.qs.mp.user.service.IUserPrizeStorageService;
 import com.qs.mp.user.service.IUserTicketOrderService;
 import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
@@ -57,21 +64,11 @@ import org.springframework.web.bind.annotation.RestController;
 @AllArgsConstructor
 public class UserDeliverOrderController extends BaseApiController {
 
-
-  @Autowired
-  private ITicketBoxService ticketBoxService;
-
-  @Autowired
-  private IUserTicketOrderService userTicketOrderService;
-
-  @Autowired
-  private ITicketService ticketService;
-
   @Autowired
-  private IUserCouponService userCouponService;
+  private IUserPrizeStorageService userPrizeStorageService;
 
   @Autowired
-  private ICouponTicketService couponTicketService;
+  private IUserAddrService userAddrService;
 
   @Autowired
   private IWalletService walletService;
@@ -84,74 +81,47 @@ public class UserDeliverOrderController extends BaseApiController {
 
 
   /**
-   * 订单结算，每次更换优惠券时需重新请求此接口
+   * 订单结算，每次更换地址时需重新请求此接口
    */
   @PostMapping("/order/settle")
-  @ApiOperation(value = "订单结算" , notes = "单个盲票商品上点立即购买")
-  public AjaxResult settle(@Valid @RequestBody TicketOrderParam param) {
-    if (StringUtils.isBlank(param.getTicketId()) && StringUtils.isBlank(param.getBoxId())) {
-      return AjaxResult.error("参数缺失");
-    }
+  @ApiOperation(value = "订单结算" , notes = "奖品库里点提货")
+  public AjaxResult settle(@Valid @RequestBody DeliverOrderParam param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
 
-    TicketOrderSettleVO orderSettleVO = new TicketOrderSettleVO();
+    DeliverOrderSettleVO orderSettleVO = new DeliverOrderSettleVO();
 
+    // 收货地址，如果用户选了地址，则此处不做处理
+    if (null == param.getAddrId() || 0 == param.getAddrId()) {
+      //读取默认地址
+      UserAddr addr = userAddrService.getDefaultChannelAddr(userId);
+      if (null != addr) {
+        orderSettleVO.setAddr(addr);
+      }
+    }
 
     // 订单金额计算
     Integer orderAmt = 0;
-    Integer discountAmt = 0;
-    TicketBox ticketBox;
-    if (StringUtils.isNotBlank(param.getTicketId())) {
-      // 线下扫码购票
-      Ticket ticket = ticketService.getById(param.getTicketId());
-      ticketBox = ticketBoxService.getById(ticket.getBoxId());
-      orderAmt = ticketBox.getSalePrice();
-    } else {
-      // 线上购票
-      ticketBox = ticketBoxService.getById(param.getBoxId());
-      orderAmt = ticketBox.getSalePrice() * param.getOrderNum();
-    }
+    Integer freightAmt = 0;
+
+    List<UserPrizeStorage> prizeStorageList = userPrizeStorageService.list(new LambdaQueryWrapper<UserPrizeStorage>()
+        .eq(UserPrizeStorage::getUserId, userId).eq(UserPrizeStorage::getStatus, PrizeStorageStatusEnum.NOT_DISTRIBUTED)
+        .in(UserPrizeStorage::getStorageId, param.getIds()));
 
-    if (param.getAutoCoupon() == 1) {
-      // 系统自动选择优惠券，按照金额从大到小排序
-      List<UserCouponVO> userCouponList = userCouponService.listTicketOrderCoupon(userId);
-      for (UserCouponVO userCouponVO : userCouponList) {
-        if (orderAmt >= userCouponVO.getMinOrderAmt() && orderAmt >= userCouponVO.getDiscount()) {
-          if (userCouponVO.getUseArea() == CouponUseAreaEnum.PRE_SCOPE) {
-            // 使用范围验证
-            List<CouponTicket> couponTicketList = couponTicketService.list(new LambdaQueryWrapper<CouponTicket>()
-                .eq(CouponTicket::getCouponId, userCouponVO.getCouponId()).eq(CouponTicket::getBoxId, ticketBox.getBoxId()));
-            if (CollectionUtils.isEmpty(couponTicketList)) {
-              continue;
-            }
-          }
-          orderSettleVO.getCouponList().add(userCouponVO);
-          discountAmt = userCouponVO.getDiscount();
-        }
-      }
-    } else if (!CollectionUtils.isEmpty(param.getUserCouponIds())){
-      // 查询指定券
-      orderSettleVO.setCouponList(userCouponService.listTicketOrderCouponByIds(param.getUserCouponIds()));
-    }
 
     orderSettleVO.setOrderAmt(orderAmt);
-    orderSettleVO.setDiscountAmt(discountAmt);
-    // 当前没有运费和优惠，实付金额=订单金额
-    orderSettleVO.setPayAmt(orderAmt - discountAmt);
-    orderSettleVO.setOrderNum(param.getOrderNum());
-    orderSettleVO.setBoxId(param.getBoxId());
-    orderSettleVO.setTicketId(param.getTicketId());
-    orderSettleVO.setPicUrl(ticketBox.getPicUrl());
+    orderSettleVO.setFreightAmt(freightAmt);
+    orderSettleVO.setPayAmt(orderAmt + freightAmt);
+    orderSettleVO.setPrizeList(prizeStorageList);
 
     // 缓存订单结算对象
-    redisCache.setCacheObject(RedisKey.build(RedisKey.USER_TICKET_ORDER_KEY, userId), orderSettleVO, 10, TimeUnit.MINUTES);
+    redisCache.setCacheObject(RedisKey.build(RedisKey.USER_DELIVER_ORDER_KEY, userId), orderSettleVO, 10, TimeUnit.MINUTES);
     return AjaxResult.success(orderSettleVO);
   }
 
-
-  /**
+/*
+  *//**
    * 提交订单
-   */
+   *//*
   @PostMapping("/order/submit")
   @ApiOperation(value = "提交订单" , notes = "在订单确认页面提交")
   public AjaxResult submit(@RequestBody UserTicketOrder order) {
@@ -169,9 +139,9 @@ public class UserDeliverOrderController extends BaseApiController {
   }
 
 
-  /**
+  *//**
    * 取消订单
-   */
+   *//*
   @PostMapping("/order/cancel")
   @ApiOperation(value = "取消订单" , notes = "在订单列表页面取消")
   public AjaxResult cancel(@RequestBody ChannelOrder order) {
@@ -179,9 +149,9 @@ public class UserDeliverOrderController extends BaseApiController {
     return AjaxResult.success("取消成功");
   }
 
-  /**
+  *//**
    * 订单支付
-   */
+   *//*
   @PostMapping("/order/pay")
   @ApiOperation(value = "订单支付" , notes = "在盲票页面支付")
   public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
@@ -194,6 +164,6 @@ public class UserDeliverOrderController extends BaseApiController {
       return AjaxResult.error(e.getMessage());
     }
     return AjaxResult.success(jsonObject);
-  }
+  }*/
 
 }

mp-service/src/main/java/com/qs/mp/framework/redis/RedisKey.java

@@ -11,7 +11,8 @@ import com.qs.mp.common.utils.MessageHelper;
 public enum RedisKey {
     WX_APP_TOKEN_KEY("app_token_key_{0}", "小程序app token"),
     CHANNEL_ORDER_KEY("channel_order_{0}", "经销商下的盲票采购单"),
-    USER_TICKET_ORDER_KEY("user_ticket_order_key_{0}", "用户购票订单");
+    USER_TICKET_ORDER_KEY("user_ticket_order_key_{0}", "用户购票订单"),
+    USER_DELIVER_ORDER_KEY("user_deliver_order_key_{0}", "用户提货订单");
 
     public String keyTemplate;
     public String desc;

mp-service/src/main/java/com/qs/mp/user/domain/param/DeliverOrderParam.java

@@ -0,0 +1,19 @@
+package com.qs.mp.user.domain.param;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.List;
+import javax.validation.constraints.NotEmpty;
+import lombok.Data;
+
+@ApiModel(value= "提货订单参数")
+@Data
+public class DeliverOrderParam {
+
+	@NotEmpty(message = "奖品库ID不能为空")
+	@ApiModelProperty(value = "奖品库IDs",required=true)
+	private List<String> ids;
+
+	@ApiModelProperty(value = "地址ID",required=false)
+	private Long addrId;
+}

mp-service/src/main/java/com/qs/mp/user/domain/vo/DeliverOrderSettleVO.java

@@ -0,0 +1,38 @@
+package com.qs.mp.user.domain.vo;
+
+import com.qs.mp.user.domain.UserAddr;
+import com.qs.mp.user.domain.UserPrizeStorage;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.Data;
+
+/**
+ * @author zhongcp
+ * @Date 2022/3/3
+ */
+@Data
+public class DeliverOrderSettleVO {
+
+  private UserAddr addr;
+
+  /**
+   * 订单金额
+   */
+  private Integer orderAmt = 0;
+
+  /**
+   * 运费
+   */
+  private Integer freightAmt = 0;
+
+  /**
+   * 实付金额
+   */
+  private Integer payAmt = 0;
+
+  /**
+   * 奖品库列表
+   */
+  List<UserPrizeStorage> prizeList = new ArrayList<>();
+
+}