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

Dev

See merge request quanshu/mp-server!143

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.admin;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.channel.mall;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.channel.mall;
 
 import com.alibaba.fastjson.JSONObject;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.channel.mall;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.common;
 
 import com.alibaba.fastjson.JSONObject;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.user;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.user;
 
 import com.alibaba.fastjson.JSONObject;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.user;
 
 import com.alibaba.fastjson.JSONObject;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.user;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;

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

@@ -1,13 +1,3 @@
-/*
- * Copyright (c) 2018-2999 广州市蓝海创新科技有限公司 All rights reserved.
- *
- * https://www.mall4j.com/
- *
- * 未经允许，不可做商业用途！
- *
- * 版权所有，侵权必究！
- */
-
 package com.qs.mp.web.controller.api.user;
 
 import com.alibaba.fastjson.JSONObject;

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

@@ -26,7 +26,7 @@ public class UserTicketOrderItemServiceImpl extends ServiceImpl<UserTicketOrderI
   @Override
   public UserTicketOrderItem queryFinishedOrderItem(Long userId, String ticketId) {
     List<UserTicketOrderItem> itemList = getBaseMapper().listTicketOrderItemVO(new QueryWrapper<UserTicketOrderItem>().eq("t1.ticket_id", ticketId)
-        .eq("t1.userId", userId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED));
+        .eq("t1.user_id", userId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED));
     if (CollectionUtils.isEmpty(itemList)) {
       return null;
     }
@@ -37,14 +37,14 @@ public class UserTicketOrderItemServiceImpl extends ServiceImpl<UserTicketOrderI
   public List<TicketListVO> listMyTicketVO(Long userId, TicketStatusEnum status) {
 
     return getBaseMapper().listMyTicketVO(new QueryWrapper<UserTicketOrderItem>()
-        .eq("t1.userId", userId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED)
+        .eq("t1.user_id", userId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED)
         .eq("t3.status", status));
   }
 
   @Override
   public int countMyTicket(Long userId, TicketStatusEnum status) {
     return getBaseMapper().countMyTicket(new QueryWrapper<UserTicketOrderItem>()
-        .eq("t1.userId", userId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED)
+        .eq("t1.user_id", userId).eq("t2.status", UserTicketOrderStatusEnum.FINISHED)
         .eq("t3.status", status));
   }
 }

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

@@ -11,12 +11,16 @@ import com.qs.mp.admin.service.ITicketBoxService;
 import com.qs.mp.admin.service.ITicketService;
 import com.qs.mp.channel.domain.Channel;
 import com.qs.mp.channel.domain.ChannelCommission;
+import com.qs.mp.channel.domain.ChannelMoneyLog;
 import com.qs.mp.channel.domain.ChannelOrderDetail;
 import com.qs.mp.channel.domain.ChannelUserRel;
 import com.qs.mp.channel.service.IChannelCommissionService;
+import com.qs.mp.channel.service.IChannelMoneyLogService;
 import com.qs.mp.channel.service.IChannelOrderDetailService;
 import com.qs.mp.channel.service.IChannelService;
 import com.qs.mp.channel.service.IChannelUserRelService;
+import com.qs.mp.common.enums.ChannelMoneyBizTypeEnum;
+import com.qs.mp.common.enums.ChannelMoneyEnum;
 import com.qs.mp.common.enums.CommStatusEnum;
 import com.qs.mp.common.enums.MqTopicType;
 import com.qs.mp.common.enums.TicketBoxStatusEnum;
@@ -93,6 +97,9 @@ public class UserTicketOrderServiceImpl extends
   @Autowired
   private IChannelCommissionService channelCommissionService;
 
+  @Autowired
+  private IChannelMoneyLogService channelMoneyLogService;
+
   @Autowired
   private BizIdGenerator bizIdGenerator;
 
@@ -343,6 +350,14 @@ public class UserTicketOrderServiceImpl extends
           channelCommission.getCommRate()).intValue());
       channelCommissionService.save(channelCommission);
       // 经销商账户余额增加
+      ChannelMoneyLog moneyLog = new ChannelMoneyLog();
+      moneyLog.setChannelId(channel.getChannelId());
+      moneyLog.setType(ChannelMoneyEnum.COMMISSION);
+      moneyLog.setLogMoney(channelCommission.getCommAmt());
+      moneyLog.setBizTime(new Date());
+      moneyLog.setRefType(ChannelMoneyBizTypeEnum.COMMISSION);
+      moneyLog.setRefId(String.valueOf(channelCommission.getId()));
+      channelMoneyLogService.changeMoney(moneyLog);
 
       // 渠道分润