Merge branch 'dev' of http://113.31.163.91:7777/quanshu/mp-server.git

into dev

Conflicts:
	mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

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

@@ -50,12 +50,6 @@ public class GoodsMgrController extends BaseApiController {
 	@Autowired
 	private IGoodsSkuService goodsSkuService;
 
-//	@Autowired
-//	private IGoodsCategoryService goodsCategoryService;
-	
-//	@Autowired
-//	private ISysUserService sysUserService;
-
 	@Autowired
 	private MapperFacade mapperFacade;
 
@@ -70,7 +64,9 @@ public class GoodsMgrController extends BaseApiController {
 		startPage();
 		QueryWrapper<Goods> queryWrapper = new QueryWrapper<Goods>();
 		queryWrapper.lambda().like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), Goods::getTitle, queryParam.getTitle());
-		queryWrapper.lambda().eq(null != queryParam && null != queryParam.getGoodsId(), Goods::getGoodsId, queryParam.getGoodsId());
+		queryWrapper.lambda()
+					.eq(null != queryParam && null != queryParam.getGoodsId() && 0 != queryParam.getGoodsId(),
+							Goods::getGoodsId, queryParam.getGoodsId());
 		// 成本
 		queryWrapper.lambda().ge(null != queryParam && null != queryParam.getMinCost(), Goods::getCost, queryParam.getMinCost());
 		queryWrapper.lambda().le(null != queryParam && null != queryParam.getMaxCost(), Goods::getCost, queryParam.getMaxCost());
@@ -96,12 +92,12 @@ public class GoodsMgrController extends BaseApiController {
 	 */
 	@PostMapping(value = "/detail")
 	public AjaxResult getGoodsDetail(@RequestBody JSONObject jsonObject) {
-		String goodsId = jsonObject.getString("goodsId");
-	    if (StringUtils.isBlank(goodsId)){
+		Long goodsId = jsonObject.getLong("goodsId");
+	    if (null == goodsId || 0 == goodsId){
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
 		Goods goods = goodsService.getById(goodsId);
-		if(null == goods || null == goods.getGoodsId() || 0 == goods.getGoodsId()) {
+		if(null == goods) {
 			 return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		GoodsVO goodsVo = new GoodsVO();
@@ -127,7 +123,7 @@ public class GoodsMgrController extends BaseApiController {
 	@ApiOperation(value = "新增商品信息", notes = "后台商品管理新增商品")
 	@PostMapping("/create")
 	public AjaxResult goodsCreate(@Validated @RequestBody GoodsParam goodsParam) {
-		if (null != goodsParam.getGoodsId()) {
+		if (null != goodsParam.getGoodsId() || 0 !=  goodsParam.getGoodsId()) {
 			return AjaxResult.error("该商品已存在");
 		}
 		Goods goods = mapperFacade.map(goodsParam, Goods.class);
@@ -178,7 +174,7 @@ public class GoodsMgrController extends BaseApiController {
 	@ApiOperation(value = "编辑商品信息", notes = "后台商品管理修改商品信息")
 	@PostMapping("/update")
 	public AjaxResult goodsUpdate(@Validated @RequestBody GoodsParam goodsParam) {
-		if (null == goodsParam || null == goodsParam.getGoodsId()) {
+		if (null == goodsParam || null != goodsParam.getGoodsId() || 0 == goodsParam.getGoodsId()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		Goods oldGoods = goodsService.getById(goodsParam.getGoodsId());
@@ -236,15 +232,15 @@ public class GoodsMgrController extends BaseApiController {
 	 */
 	@ApiOperation(value = "停用、启用商品", notes = "停用、启用商品")
 	@PostMapping("/status")
-	public AjaxResult goodsStatus(@RequestBody Goods goods) {
-		Long goodsId = goods.getGoodsId();
-		GoodsStatusEnum status = (null != goods && null != goods.getStatus())?goods.getStatus():null;
-		if (null == goodsId || 0 == goodsId
-				|| null == status) {
+	public AjaxResult goodsStatus(@RequestBody JSONObject jsonObject) {
+		String goodsId = jsonObject.getString("goodsId");
+
+		GoodsStatusEnum status = GoodsStatusEnum.getStatusEnum(jsonObject.getString("status"));
+		if (StringUtils.isBlank(goodsId) || null == status) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		try {
-			goodsService.lambdaUpdate().set(Goods::getStatus, goods.getStatus()).eq(Goods::getGoodsId, goodsId).update();
+			goodsService.lambdaUpdate().set(Goods::getStatus, status).eq(Goods::getGoodsId, goodsId).update();
 			// 查询代金券信息
 		} catch (Exception e) {
 			return AjaxResult.error("操作失败");
@@ -261,8 +257,8 @@ public class GoodsMgrController extends BaseApiController {
 	 */
 	@PostMapping(value = "/remove")
 	public AjaxResult removeGoods(@RequestBody JSONObject jsonObject) {
-		String goodsId = jsonObject.getString("goodsId");
-	    if (StringUtils.isBlank(goodsId)){
+		Long goodsId = jsonObject.getLong("goodsId");
+	    if (null == goodsId || 0 == goodsId){
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
 		Goods goods = goodsService.getById(goodsId);

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

@@ -27,6 +27,7 @@ import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.enums.TicketStatusEnum;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.user.domain.param.ExchangeOrderParam;
+import com.qs.mp.user.service.IUserExchangeOrderService;
 import com.qs.mp.user.service.IUserHitPrizeService;
 import com.qs.mp.user.service.IUserTicketOrderItemService;
 import com.qs.mp.utils.SecurityUtils;
@@ -58,6 +59,9 @@ public class UserExchangeController extends BaseApiController {
   @Autowired
   private IGoodsSkuService goodsSkuService;
 
+  @Autowired
+  private IUserExchangeOrderService userExchangeOrderService;
+
 
   @Autowired
   private MapperFacade mapperFacade;
@@ -108,11 +112,12 @@ public class UserExchangeController extends BaseApiController {
   @PostMapping("/submit")
   @ApiOperation(value = "提交兑换订单" , notes = "提交兑换订单")
   public AjaxResult submit(@RequestBody ExchangeOrderParam param) {
-    if (StringUtils.isBlank(param.getGoodsId()) || null == param.getOrderNum()
+    Long userId = SecurityUtils.getUserId();
+    if (null == param.getGoodsId() || 0 == param.getGoodsId() || null == param.getOrderNum()
         || param.getOrderNum() == 0) {
       return AjaxResult.error("参数缺失");
     }
-
+    userExchangeOrderService.exchange(userId, param.getGoodsId(), param.getSkuId(), param.getOrderNum());
     return AjaxResult.success();
   }
 

mp-common/src/main/java/com/qs/mp/common/enums/GoodsStatusEnum.java

@@ -20,6 +20,15 @@ public enum GoodsStatusEnum implements IEnum<String> {
   private final String value;
   private final String desc;
 
+  public static GoodsStatusEnum getStatusEnum(String value) {
+    for (GoodsStatusEnum statusEnum : GoodsStatusEnum.values()) {
+      if (statusEnum.getValue().equals(value)) {
+        return statusEnum;
+      }
+    }
+    return null;
+  }
+
   GoodsStatusEnum(final String value, final String desc) {
     this.value = value;
     this.desc = desc;

mp-quartz/src/main/java/com/qs/mp/quartz/task/ChannelOrderTask.java

@@ -18,6 +18,7 @@ import org.springframework.stereotype.Component;
  */
 @Component("channelOrderTask")
 public class ChannelOrderTask {
+
   protected final Logger logger = LoggerFactory.getLogger(this.getClass().getSimpleName());
 
   @Autowired
@@ -33,10 +34,11 @@ public class ChannelOrderTask {
     int total = PAGE_SIZE;
     while (total == PAGE_SIZE) {
       // 捞取30分钟前未支付订单
-      List<ChannelOrder> channelOrderList = channelOrderService.list(new LambdaQueryWrapper<ChannelOrder>().eq(ChannelOrder::getStatus,
-              ChannelOrderStatusEnum.NOT_PAY)
-          .lt(ChannelOrder::getCreatedTime, DateUtils.addMinutes(DateUtils.getNowDate(), -30))
-          .last("limit " + PAGE_SIZE));
+      List<ChannelOrder> channelOrderList = channelOrderService.list(
+          new LambdaQueryWrapper<ChannelOrder>()
+              .eq(ChannelOrder::getStatus, ChannelOrderStatusEnum.NOT_PAY)
+              .lt(ChannelOrder::getCreatedTime, DateUtils.addMinutes(DateUtils.getNowDate(), -30))
+              .last("limit " + PAGE_SIZE));
       total = channelOrderList.size();
       for (ChannelOrder channelOrder : channelOrderList) {
         try {

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsParam.java

@@ -64,7 +64,7 @@ public class GoodsParam {
 	 */
 	@ApiModelProperty(value = "商品价值", required = false)
 	private Integer value;
-	
+
 
 	/**
 	 * 商品成本
@@ -83,7 +83,7 @@ public class GoodsParam {
 	 */
 	@ApiModelProperty(value = "已兑换量", required = false)
 	private Integer exchangedQty;
-	
+
 	  /**
 	   * 兑换大厅是否展示，0不展示，1展示
 	   */
@@ -105,7 +105,7 @@ public class GoodsParam {
 	@JSONField(serialzeFeatures = SerializerFeature.WriteEnumUsingToString)
 	private GoodsStatusEnum status;
 
-	
+
 	@ApiModelProperty(value = "商品多SKU列表", required = false)
 	private List<GoodsSku> skuList;
 

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

@@ -12,10 +12,10 @@ public class ExchangeOrderParam {
 
 	@NotEmpty(message = "商品ID不能为空")
 	@ApiModelProperty(value = "商品ID",required=true)
-	private String goodsId;
+	private Long goodsId;
 
 	@ApiModelProperty(value = "skuID",required=true)
-	private String skuId;
+	private Long skuId;
 
 	@NotEmpty(message = "兑换数量不能为空")
 	@ApiModelProperty(value = "兑换数量",required=false)