Merge branch 'mp-server-test' into 'master'

Mp server test

See merge request quanshu/mp-server!283

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

@@ -60,7 +60,9 @@ public class ChannelMoneyController extends BaseApiController {
     for (ChannelMoneyLogVO logVO : channelMoneyLogVOS) {
       if (logVO.getType() == ChannelMoneyEnum.WITHDRAW) {
         ChannelWithdraw channelWithdraw = channelWithdrawService.getById(logVO.getRefId());
-        logVO.setWithdrawStatus(channelWithdraw.getStatus());
+        if (null != channelWithdraw) {
+          logVO.setWithdrawStatus(channelWithdraw.getStatus());
+        }
       }
     }
     TableDataInfo resp = getDataTable(list);

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

@@ -241,6 +241,7 @@ public class ChannelOrderController extends BaseApiController {
     try {
       jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), sysUser.getChannelOpenId(), channelOrder.getPayAmt());
     }catch (ServiceException e) {
+      LogUtil.error(logger, e, "根据经销商采购订单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());
     }
     return AjaxResult.success(jsonObject);

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

@@ -131,6 +131,7 @@ public class UserController extends BaseApiController {
     user.setSessionKey(sessionKey);
     user.setUnionId(unionId);
     user.setLoginDate(new Date());
+    user.setNickName(wxLoginParams.getNickName());
     //如果用户头像字段为空，则默认获取用户微信头像
     String avatarUrl = wxLoginParams.getAvatarUrl();
 
@@ -234,18 +235,19 @@ public class UserController extends BaseApiController {
   @RequestMapping(value = "/user/getLoginUserinfo", method = RequestMethod.POST)
   public AjaxResult getLoginUserinfo(@RequestBody JSONObject params) {
     LoginUser loginUser = SecurityUtils.getLoginUser();
+    SysUser sysUser = sysUserService.selectUserById(SecurityUtils.getUserId());
 
     JSONObject jsonObject = new JSONObject();
-    jsonObject.put("userName", loginUser.getUsername());
-    jsonObject.put("avatar", loginUser.getUser().getAvatar());
+    jsonObject.put("userName", sysUser.getUserName());
+    jsonObject.put("avatar", sysUser.getAvatar());
     if(loginUser.getIdentity() == UserIdentityEnum.CHANNEL) {
       Channel channel = channelService.getById(loginUser.getChannelId());
       jsonObject.put("nickName", channel.getName());
     } else {
-      jsonObject.put("nickName", loginUser.getUser().getNickName());
+      jsonObject.put("nickName", sysUser.getNickName());
     }
-    jsonObject.put("openId", loginUser.getUser().getOpenId());
-    jsonObject.put("channelOpenId", loginUser.getUser().getChannelOpenId());
+    jsonObject.put("openId", sysUser.getOpenId());
+    jsonObject.put("channelOpenId", sysUser.getChannelOpenId());
     JSONArray roleKeys = new JSONArray();
     JSONArray roles = new JSONArray();
     loginUser.getUser().getRoles().forEach(sysRole -> roles.add(sysRole.getRoleName()));

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

@@ -12,12 +12,16 @@ import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
 import com.qs.mp.common.core.redis.RedisCache;
 import com.qs.mp.common.enums.BizTypeEnum;
+import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
 import com.qs.mp.common.service.IDeliveryCompanyService;
+import com.qs.mp.common.utils.LogUtil;
 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.system.domain.SysUser;
+import com.qs.mp.system.service.ISysUserService;
 import com.qs.mp.user.domain.UserAddr;
 import com.qs.mp.user.domain.UserDeliverOrder;
 import com.qs.mp.user.domain.UserDeliverOrderItem;
@@ -70,10 +74,10 @@ public class UserDeliverOrderController extends BaseApiController {
   private IWalletService walletService;
 
   @Autowired
-  private IDeliveryCompanyService deliveryCompanyService;
+  private MapperFacade mapperFacade;
 
   @Autowired
-  private MapperFacade mapperFacade;
+  private ISysUserService sysUserService;
 
   @Autowired
   private RedisCache redisCache;
@@ -171,6 +175,9 @@ public class UserDeliverOrderController extends BaseApiController {
     if (null == orderSettleVO) {
       return AjaxResult.error("订单已过期，请重新下单");
     }
+    if (null == orderSettleVO.getAddr()) {
+      return AjaxResult.error("请填写收货地址");
+    }
     String orderId = userDeliverOrderService.submitOrder(userId, orderSettleVO);
     JSONObject jsonObject = new JSONObject();
     jsonObject.put("orderId", orderId);
@@ -202,12 +209,17 @@ public class UserDeliverOrderController extends BaseApiController {
   @PostMapping("/order/pay")
   @ApiOperation(value = "订单支付" , notes = "订单支付")
   public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
-    String openId = SecurityUtils.getLoginUser().getUser().getOpenId();
+    Long userId = SecurityUtils.getLoginUser().getUserId();
+    SysUser sysUser = sysUserService.selectUserById(userId);
+    if (StringUtils.isBlank(sysUser.getOpenId())) {
+      return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
+    }
     UserDeliverOrder deliverOrder = userDeliverOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(), openId, deliverOrder.getPayAmt());
+      jsonObject = walletService.pay(BizTypeEnum.DELIVER_ORDER, param.getOrderId(), sysUser.getOpenId(), deliverOrder.getPayAmt());
     }catch (ServiceException e) {
+      LogUtil.error(logger, e, "根据提货单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());
     }
     return AjaxResult.success(jsonObject);

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

@@ -1,5 +1,6 @@
 package com.qs.mp.web.controller.api.user;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.Goods;
@@ -72,10 +73,16 @@ public class UserExchangeController extends BaseApiController {
    */
   @PostMapping("/goods/list")
   @ApiOperation(value = "商品列表" , notes = "获取所有可兑换商品")
-  public TableDataInfo list(@RequestBody Goods goods) {
+  public TableDataInfo list(@RequestBody JSONObject param) {
+    Long categoryId = param.getLong("categoryId");
+    Integer startPrice = param.getInteger("startPrice");
+    Integer endPrice = param.getInteger("endPrice");
+
     startPage();
     List<Goods> goodsList = goodsService.list(new LambdaQueryWrapper<Goods>()
-        .eq(null != goods.getCategoryId() && 0 != goods.getCategoryId(), Goods::getCategoryId, goods.getCategoryId())
+        .eq(null != categoryId && 0 != categoryId, Goods::getCategoryId, categoryId)
+        .ge(null != startPrice && 0 != startPrice, Goods::getExchangePrice, startPrice)
+        .le(null != endPrice && 0 != endPrice, Goods::getExchangePrice, endPrice)
         .eq(Goods::getStatus, GoodsStatusEnum.PUT_ON)
         .eq(Goods::getExchangeShow, 1));
     List<GoodsListVO> goodsListVOList = mapperFacade.mapAsList(goodsList, GoodsListVO.class);

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

@@ -16,6 +16,7 @@ import com.qs.mp.common.enums.BizTypeEnum;
 import com.qs.mp.common.enums.CouponUseAreaEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.exception.ServiceException;
+import com.qs.mp.common.utils.LogUtil;
 import com.qs.mp.common.utils.StringUtils;
 import com.qs.mp.framework.redis.RedisKey;
 import com.qs.mp.pay.service.IWalletService;
@@ -197,6 +198,7 @@ public class UserTicketOrderController extends BaseApiController {
     try {
       jsonObject = walletService.pay(BizTypeEnum.TICKET_ORDER, param.getOrderId(), sysUser.getOpenId(), ticketOrder.getPayAmt());
     }catch (ServiceException e) {
+      LogUtil.error(logger, e, "根据盲票购买订单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());
     }
     return AjaxResult.success(jsonObject);

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

@@ -28,6 +28,7 @@ public enum ErrorCodeEnum {
   ERROR_CODE_1019(1019, "盲票未付款"),
   ERROR_CODE_1020(1020, "库存不足"),
   ERROR_CODE_1021(1021, "盲豆余额不足"),
+  ERROR_CODE_1022(1022, "订单支付中"),
   ;
   private int code;
   private String msg;

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderItemServiceImpl.java

@@ -2,6 +2,7 @@ package com.qs.mp.user.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qs.mp.admin.domain.vo.TicketListVO;
+import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.TicketStatusEnum;
 import com.qs.mp.common.enums.UserTicketOrderStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
@@ -54,7 +55,7 @@ public class UserTicketOrderItemServiceImpl extends ServiceImpl<UserTicketOrderI
     List<TicketListVO> ticketListVOS = getBaseMapper().listMyTicketVO(new QueryWrapper<UserTicketOrderItem>()
         .eq("t1.user_id", userId).eq("t1.order_id", orderId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED));
     if (CollectionUtils.isEmpty(ticketListVOS)) {
-      throw new ServiceException("订单不存在");
+      throw new ServiceException(ErrorCodeEnum.ERROR_CODE_1022);
     }
     return ticketListVOS.get(0);
   }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserTicketOrderServiceImpl.java

@@ -21,6 +21,7 @@ import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.channel.service.IChannelUserRelService;
 import com.qs.mp.common.enums.ChannelMoneyEnum;
 import com.qs.mp.common.enums.CommStatusEnum;
+import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.MqTopicType;
 import com.qs.mp.common.enums.TicketBoxStatusEnum;
 import com.qs.mp.common.enums.TicketStatusEnum;
@@ -122,7 +123,7 @@ public class UserTicketOrderServiceImpl extends
       LogUtil.error(logger, "库存不足，boxId:{0},qty:{1},saleQty:{2},orderNum:{3}",
           ticketBox.getBoxId(), ticketBox.getQuantity(), ticketBox.getSaleQty(),
           orderSettleVO.getOrderNum());
-      throw new ServiceException("库存不足");
+      throw new ServiceException(ErrorCodeEnum.ERROR_CODE_1020);
     }
     boolean rst = ticketBoxService.update(
         new LambdaUpdateWrapper<TicketBox>().set(TicketBox::getSaleQty,