后台

.idea/mybatisx/templates.xml

@@ -49,8 +49,8 @@
             <option name="tableUIInfoList">
               <list>
                 <TableUIInfo>
-                  <option name="className" value="AskaSplitrecord" />
-                  <option name="tableName" value="aska_splitRecord" />
+                  <option name="className" value="AskaChannelnos" />
+                  <option name="tableName" value="aska_channelnos" />
                 </TableUIInfo>
               </list>
             </option>

admin/src/main/java/com/mofangchuxing/aska/admin/controller/AccountController.java

@@ -3,6 +3,7 @@ package com.mofangchuxing.aska.admin.controller;
 import com.mofangchuxing.aska.dao.domain.AskaAccounts;
 import com.mofangchuxing.aska.domain.R;
 import com.mofangchuxing.aska.domain.dto.AccountDto;
+import com.mofangchuxing.aska.domain.utils.PageUtils;
 import com.mofangchuxing.aska.service.UserService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -33,10 +34,17 @@ public class AccountController extends AdminBaseController{
         if (askaAccounts == null){
             return R.error("token_expire");
         }
-        List<AskaAccounts> askaAccountsList = userService.listUsers(accountDto);
-        result.put("list", askaAccountsList);
-        return R.ok(result);
+        PageUtils pageUtils = userService.listUsers(accountDto);
+        return R.ok(pageUtils);
     }
 
-
+    @PostMapping("/addAccount")
+    public R addAccount(@RequestBody AccountDto accountDto) {
+        AskaAccounts askaAccounts = getSysUser(accountDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaAccounts newAskaAccounts = userService.addAccount(accountDto);
+        return R.ok(newAskaAccounts);
+    }
 }

admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelController.java

@@ -1,11 +1,14 @@
 package com.mofangchuxing.aska.admin.controller;
 
 import com.mofangchuxing.aska.dao.domain.AskaAccounts;
-import com.mofangchuxing.aska.dao.domain.AskaChannels;
 import com.mofangchuxing.aska.domain.R;
+import com.mofangchuxing.aska.domain.dto.ChannelCouponDto;
 import com.mofangchuxing.aska.domain.dto.ChannelDto;
+import com.mofangchuxing.aska.domain.dto.ChannelNoDto;
+import com.mofangchuxing.aska.domain.dto.OrderDto;
 import com.mofangchuxing.aska.domain.utils.PageUtils;
 import com.mofangchuxing.aska.service.ChannelService;
+import com.mofangchuxing.aska.service.OrderService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -15,74 +18,55 @@ import javax.annotation.Resource;
 
 /**
  * @Author: syl
- * @Date: 2023/8/4
+ * @Date: 2023/8/24
  * @Description:
  */
 @RestController
-@RequestMapping("/ChannelMng")
+@RequestMapping("/channel")
 public class ChannelController extends AdminBaseController{
 
     @Resource
     private ChannelService channelService;
+    @Resource
+    private OrderService orderService;
 
-    @PostMapping("/addChannel")
-    public R addChannel(@RequestBody ChannelDto channelDto) {
-        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
-        if (askaAccounts == null){
-            return R.error("token_expire");
-        }
-        AskaChannels askaChannels = channelService.addChannel(channelDto);
-        return R.ok(askaChannels);
-    }
-
-    @PostMapping("/updateChannel")
-    public R updateChannel(@RequestBody ChannelDto channelDto) {
-        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
-        if (askaAccounts == null){
-            return R.error("token_expire");
-        }
-        AskaChannels askaChannels = channelService.updateChannel(channelDto);
-        return R.ok(askaChannels);
-    }
-
-    @PostMapping("/stopChannel")
-    public R stopChannel(@RequestBody ChannelDto channelDto) {
-        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+    @PostMapping("/getOrderList")
+    public R getOrderList(@RequestBody OrderDto orderDto) {
+        AskaAccounts askaAccounts = getSysUser(orderDto.getT());
         if (askaAccounts == null){
             return R.error("token_expire");
         }
-        AskaChannels askaChannels = channelService.stopChannel(channelDto);
-        return R.ok(askaChannels);
+        PageUtils pageUtils = orderService.getOrderList(orderDto);
+        return R.ok(pageUtils);
     }
 
-    @PostMapping("/setCouponRule")
-    public R setCouponRule(@RequestBody ChannelDto channelDto) {
-        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+    @PostMapping("/coupons")
+    public R coupons(@RequestBody ChannelCouponDto channelCouponDto) {
+        AskaAccounts askaAccounts = getSysUser(channelCouponDto.getT());
         if (askaAccounts == null){
             return R.error("token_expire");
         }
-        channelService.setCouponRule();
-        return R.ok();
+        PageUtils pageUtils = channelService.getCouponsList(channelCouponDto);
+        return R.ok(pageUtils);
     }
 
-    @PostMapping("/getAllChannels")
-    public R getAllChannels(@RequestBody ChannelDto channelDto) {
-        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+    @PostMapping("/getChannelNoList")
+    public R getChannelNoList(@RequestBody ChannelCouponDto channelCouponDto) {
+        AskaAccounts askaAccounts = getSysUser(channelCouponDto.getT());
         if (askaAccounts == null){
             return R.error("token_expire");
         }
-        PageUtils pageUtils = channelService.getAllChannels(channelDto);
+        PageUtils pageUtils = channelService.getChannelNoList(channelCouponDto);
         return R.ok(pageUtils);
     }
 
-    @PostMapping("/getChannelDetail")
-    public R getChannelDetail(@RequestBody ChannelDto channelDto) {
-        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+    @PostMapping("/addChannelNo")
+    public R addChannelNo(@RequestBody ChannelNoDto channelNoDto) {
+        AskaAccounts askaAccounts = getSysUser(channelNoDto.getT());
         if (askaAccounts == null){
             return R.error("token_expire");
         }
-        AskaChannels askaChannels = channelService.getChannelDetail(channelDto);
-        return R.ok(askaChannels);
+        channelService.addChannelNo(channelNoDto);
+        return R.ok();
     }
-
 }

admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelMngController.java

@@ -0,0 +1,88 @@
+package com.mofangchuxing.aska.admin.controller;
+
+import com.mofangchuxing.aska.dao.domain.AskaAccounts;
+import com.mofangchuxing.aska.dao.domain.AskaChannels;
+import com.mofangchuxing.aska.domain.R;
+import com.mofangchuxing.aska.domain.dto.ChannelDto;
+import com.mofangchuxing.aska.domain.utils.PageUtils;
+import com.mofangchuxing.aska.service.ChannelService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/4
+ * @Description:
+ */
+@RestController
+@RequestMapping("/ChannelMng")
+public class ChannelMngController extends AdminBaseController{
+
+    @Resource
+    private ChannelService channelService;
+
+    @PostMapping("/addChannel")
+    public R addChannel(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaChannels askaChannels = channelService.addChannel(channelDto);
+        return R.ok(askaChannels);
+    }
+
+    @PostMapping("/updateChannel")
+    public R updateChannel(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaChannels askaChannels = channelService.updateChannel(channelDto);
+        return R.ok(askaChannels);
+    }
+
+    @PostMapping("/stopChannel")
+    public R stopChannel(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaChannels askaChannels = channelService.stopChannel(channelDto);
+        return R.ok(askaChannels);
+    }
+
+    @PostMapping("/setCouponRule")
+    public R setCouponRule(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        channelService.setCouponRule();
+        return R.ok();
+    }
+
+    @PostMapping("/getAllChannels")
+    public R getAllChannels(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        PageUtils pageUtils = channelService.getAllChannels(channelDto);
+        return R.ok(pageUtils);
+    }
+
+    @PostMapping("/getChannelDetail")
+    public R getChannelDetail(@RequestBody ChannelDto channelDto) {
+        AskaAccounts askaAccounts = getSysUser(channelDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaChannels askaChannels = channelService.getChannelDetail(channelDto);
+        return R.ok(askaChannels);
+    }
+
+}

admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailController.java

@@ -1,10 +1,12 @@
 package com.mofangchuxing.aska.admin.controller;
 
 import com.mofangchuxing.aska.dao.domain.AskaAccounts;
-import com.mofangchuxing.aska.dao.domain.AskaRetails;
 import com.mofangchuxing.aska.domain.R;
+import com.mofangchuxing.aska.domain.dto.OrderDto;
 import com.mofangchuxing.aska.domain.dto.RetailDto;
 import com.mofangchuxing.aska.domain.utils.PageUtils;
+import com.mofangchuxing.aska.domain.vo.AskaRetailsVo;
+import com.mofangchuxing.aska.service.OrderService;
 import com.mofangchuxing.aska.service.RetailService;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -15,82 +17,34 @@ import javax.annotation.Resource;
 
 /**
  * @Author: syl
- * @Date: 2023/8/1
+ * @Date: 2023/8/23
  * @Description:
  */
 @RestController
-@RequestMapping("/RetailMng")
-public class RetailController extends AdminBaseController {
-
+@RequestMapping("/Retail")
+public class RetailController extends AdminBaseController{
+    @Resource
+    private OrderService orderService;
     @Resource
     private RetailService retailService;
 
-    @PostMapping("/addRetail")
-    public R addRetail(@RequestBody RetailDto retailDto) {
-        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
-        if (askaAccounts == null){
-            return R.error("token_expire");
-        }
-        AskaRetails askaRetails = retailService.addRetail(retailDto);
-        return R.ok(askaRetails);
-    }
-
-    @PostMapping("/updateRetail")
-    public R updateRetail(@RequestBody RetailDto retailDto) {
-        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
-        if (askaAccounts == null){
-            return R.error("token_expire");
-        }
-        AskaRetails askaRetails = retailService.updateRetail(retailDto);
-        if (askaRetails == null) {
-            return R.error("门店不存在");
-        }
-        return R.ok(askaRetails);
-    }
-
-    @PostMapping("/stopRetail")
-    public R stopRetail(@RequestBody RetailDto retailDto) {
-        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
-        if (askaAccounts == null){
-            return R.error("token_expire");
-        }
-        AskaRetails askaRetails = retailService.stopRetail(retailDto);
-        if (askaRetails == null) {
-            return R.error("门店不存在");
-        }
-        return R.ok(askaRetails);
-    }
-
-    @PostMapping("/setSplitRule")
-    public R setSplitRule(@RequestBody RetailDto retailDto) {
-        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
-        if (askaAccounts == null){
-            return R.error("token_expire");
-        }
-        AskaRetails askaRetails = retailService.setSplitRule(retailDto);
-        if (askaRetails == null) {
-            return R.error("门店不存在");
-        }
-        return R.ok(askaRetails);
-    }
-
-    @PostMapping("/listAllRetails")
-    public R listAllRetails(@RequestBody RetailDto retailDto) {
-        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
+    @PostMapping("/getOrderList")
+    public R getOrderList(@RequestBody OrderDto orderDto) {
+        AskaAccounts askaAccounts = getSysUser(orderDto.getT());
         if (askaAccounts == null){
             return R.error("token_expire");
         }
-        PageUtils pageUtils = retailService.listAllRetails(retailDto);
+        PageUtils pageUtils = orderService.getOrderList(orderDto);
         return R.ok(pageUtils);
     }
 
-    @PostMapping("/getRetailDetail")
-    public R getRetailDetail(@RequestBody RetailDto retailDto) {
+    @PostMapping("/getBalance")
+    public R getBalance(@RequestBody RetailDto retailDto) {
         AskaAccounts askaAccounts = getSysUser(retailDto.getT());
         if (askaAccounts == null){
             return R.error("token_expire");
         }
-        AskaRetails askaRetails = retailService.getRetailDetail(retailDto);
-        return R.ok(askaRetails);
+        AskaRetailsVo askaRetailsVo = retailService.getBalance(retailDto);
+        return R.ok(askaRetailsVo);
     }
 }

admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailMngController.java

@@ -0,0 +1,96 @@
+package com.mofangchuxing.aska.admin.controller;
+
+import com.mofangchuxing.aska.dao.domain.AskaAccounts;
+import com.mofangchuxing.aska.dao.domain.AskaRetails;
+import com.mofangchuxing.aska.domain.R;
+import com.mofangchuxing.aska.domain.dto.RetailDto;
+import com.mofangchuxing.aska.domain.utils.PageUtils;
+import com.mofangchuxing.aska.service.RetailService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/1
+ * @Description:
+ */
+@RestController
+@RequestMapping("/RetailMng")
+public class RetailMngController extends AdminBaseController {
+
+    @Resource
+    private RetailService retailService;
+
+    @PostMapping("/addRetail")
+    public R addRetail(@RequestBody RetailDto retailDto) {
+        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaRetails askaRetails = retailService.addRetail(retailDto);
+        return R.ok(askaRetails);
+    }
+
+    @PostMapping("/updateRetail")
+    public R updateRetail(@RequestBody RetailDto retailDto) {
+        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaRetails askaRetails = retailService.updateRetail(retailDto);
+        if (askaRetails == null) {
+            return R.error("门店不存在");
+        }
+        return R.ok(askaRetails);
+    }
+
+    @PostMapping("/stopRetail")
+    public R stopRetail(@RequestBody RetailDto retailDto) {
+        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaRetails askaRetails = retailService.stopRetail(retailDto);
+        if (askaRetails == null) {
+            return R.error("门店不存在");
+        }
+        return R.ok(askaRetails);
+    }
+
+    @PostMapping("/setSplitRule")
+    public R setSplitRule(@RequestBody RetailDto retailDto) {
+        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaRetails askaRetails = retailService.setSplitRule(retailDto);
+        if (askaRetails == null) {
+            return R.error("门店不存在");
+        }
+        return R.ok(askaRetails);
+    }
+
+    @PostMapping("/listAllRetails")
+    public R listAllRetails(@RequestBody RetailDto retailDto) {
+        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        PageUtils pageUtils = retailService.listAllRetails(retailDto);
+        return R.ok(pageUtils);
+    }
+
+    @PostMapping("/getRetailDetail")
+    public R getRetailDetail(@RequestBody RetailDto retailDto) {
+        AskaAccounts askaAccounts = getSysUser(retailDto.getT());
+        if (askaAccounts == null){
+            return R.error("token_expire");
+        }
+        AskaRetails askaRetails = retailService.getRetailDetail(retailDto);
+        return R.ok(askaRetails);
+    }
+}

admin/src/main/java/com/mofangchuxing/aska/admin/controller/SysUserController.java

@@ -3,9 +3,13 @@ package com.mofangchuxing.aska.admin.controller;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.mofangchuxing.aska.dao.domain.AskaAccounts;
+import com.mofangchuxing.aska.dao.mapper.AskaChannelsMapper;
+import com.mofangchuxing.aska.dao.mapper.AskaRetailsMapper;
 import com.mofangchuxing.aska.domain.R;
 import com.mofangchuxing.aska.domain.dto.LoginDto;
 import com.mofangchuxing.aska.domain.entity.SysMenuEntity;
+import com.mofangchuxing.aska.domain.vo.AskaChannelsVo;
+import com.mofangchuxing.aska.domain.vo.AskaRetailsVo;
 import com.mofangchuxing.aska.service.UserService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.RandomStringUtils;
@@ -36,6 +40,10 @@ public class SysUserController extends AdminBaseController{
     private UserService userService;
     @Resource
     private RedisTemplate redisTemplate;
+    @Resource
+    private AskaRetailsMapper retailsMapper;
+    @Resource
+    private AskaChannelsMapper askaChannelsMapper;
 
     @RequestMapping(value = "/Login", method = {RequestMethod.POST, RequestMethod.GET})
     public R login(@RequestBody LoginDto loginDto) {
@@ -59,6 +67,19 @@ public class SysUserController extends AdminBaseController{
         result.put("userid", askaAccounts.getId());
         result.put("name", askaAccounts.getName());
         result.put("type", askaAccounts.getRole());
+        if (askaAccounts.getRole().equals("retail")) {
+            AskaRetailsVo askaRetailsVo = retailsMapper.selectByOwnerId(askaAccounts.getId());
+            if (askaRetailsVo != null) {
+                result.put("retailId", askaRetailsVo.getRetailId());
+                result.put("retailName", askaRetailsVo.getRetailName());
+            }
+        }else if (askaAccounts.getRole().equals("channel")) {
+            AskaChannelsVo askaChannelsVo = askaChannelsMapper.selectByOwnerId(askaAccounts.getId());
+            if (askaChannelsVo != null) {
+                result.put("channelId", askaChannelsVo.getChannelId());
+                result.put("channelName", askaChannelsVo.getChannelName());
+            }
+        }
         return R.ok(result);
     }
 

admin/src/main/resources/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCthKmfULCDNE+3
+R7k5RytJM0Bsbd4Zeqe+z3A8KnOS4ddzbS0NAidc2c5vtELfSWHl+E2HBTqkD4mN
+uqoT2MKfad2YwKnJyCP+3d8oUC0ynsQXoLgBSHmyCyqbOZ+lhoQx2kIV74nRJhsI
+z5i4fjusmYK+8vEBsCoKbB/8ep5CehCdL3lCgrT7YLWSRNVOQI9hl9Sm8ACIUz+C
+Vyfp7Nvr80oCux84S4bvNN07Tabt6KSMwobcOKNO81QQ+6og2V28r14TlTtqujBt
+6uMFHXiFlanVd++wuz+x6zPhu1hYBTBGA2gZpDehAUQD+dHgWQKAWB/YCRxPocg4
+Io+/FgIFAgMBAAECggEAPHTGbL2+YlhtldwlivFjAYQb5Ct7gMEdhPvdjPj1f620
+VYEqeyfO8yjoJj9WNVnqBCg5StvljJflQz5QV83kMYq/LKOkBKv47qn7QJ5+wO5U
+QC89LSVFUWVWmPLAzvlJQd1bvSzShc6TCMTb3xwMSpzJ0yHuGrp4S11U37ERRvOR
+M0drJbK8pakdDXMfmRTaBI61AO98BMf3mvJYbbvL4u9w3Q7vHqIJDuWnMH7JNx/o
+z7Ykd4/kZJHFAMSftMww7DnZWxlmy/4sLnT44Fh/SrWgQxDRcjip6xczR/gjVZg5
++/6IoiXIvoPlRXEgPNlSEzhSjEck70+dLMfgk9n2wQKBgQDmqEEUmVw8wGrX3qmZ
+fkT/zWOv74PfsP0TS6EA9AF3xO7GwqD8PUO5/OYYx4nOFzLgHHyFb7rcjESD1qis
+31VSayC80oGOu5apesWIz0RXRsXydGRc+raflSEpNsa/IQLocsDPyKt6QID1FFvs
+F31iG46gxyowuETjHAztEXn26QKBgQDAlT8h8NCFAb2IPgrMGaibYUBNK8ptbyNy
+vsuj4Gnhx1M3+Mcadv4eD7fiUU02NTWIWZfp59tkRljfOPulxN6AIt1LHjN4ml1O
++cUk39d5gpAAphqV7aAJHugmtJqOhbHx2qdgxILaherixrxZ6XznFh+xG00AjSeG
+ArZvlHH4vQKBgDr0gIXyWPgSOnzopbLc6mfzqGo8rxlK1LTM3N8wfvuM83cMIje2
+tQvhzzJANkHd/hv4S/+TOlDK7WxBPqXJA7boONrqd0DzQ6QYBEteptoj9c5t34VA
+c9NAO9Sb8prBpkuhoRS69tFtkUiTJpemvV6JKqB/p5ICV2ExN0CU+faZAoGAIY4f
+qO9HtdUezA1bXkKeQSyJwqh9peG2gHjEDLK+YCuV0WvUbUUMc/pzJMjbtjVBNZe+
+w2+1p1wmggZwump6BkOM4VjKyRnEZk1Yz1r9NVvNcX9/pF36A3zSIGRZhbm/zo81
+mMPEtQSeb5MHIHdxXuZY8Uf7e7wchdoVJY3s6dUCgYEAs3Nr2HITPV88T6uWqTCu
+Y9H5iAOgh3nUKgVtEqqcDiDiZW/WOGFoiC2ERmMdAfq9pez/LifpBbGgRZgyFqDU
+KOorQk0nA6c2ycqIN57sF+v4AqdH/Kijzbjg8751/SDK3ZP3EOW6n07aVxcx4MQq
+Til1mtXx/275XG7NfFnA9Eg=
+-----END PRIVATE KEY-----

admin/src/main/resources/application.yml

@@ -2,6 +2,8 @@ server:
   port: 8099
   tomcat:
     uri-encoding: UTF-8
+  servlet:
+    context-path: /mapi
 app.id: aska-admin
 
 
@@ -44,5 +46,8 @@ wx:
   app-appid: wxe5251793c19a48d5
   mch-id: 1641830577
   api-key: a8babfa0d75ac878dd76dc905bf677e2
+  apiv3-key: 87b90c2065d9caa1c767ff1b15b21e52
+  api-serial-no: 22098B381BAE268F47FE823C70C3AA7702EE54C4
+  public-serial-no: 5BB0B8268EB289373EDFA3B1572FE3F2F8FD3B80
   unified-order-url: https://api.mch.weixin.qq.com/pay/unifiedorder
   notify-url: https://biketest.mofangchuxing.com/askay/notify

admin/src/main/resources/wechatpay.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEFDCCAvygAwIBAgIUW7C4Jo6yiTc+36OxVy/j8vj9O4AwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjMwNDEyMDE1NTQ3WhcNMjgwNDEwMDE1NTQ3WjBuMRgwFgYDVQQDDA9U
+ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl
+bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo
+ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD3iAUhkxTp/iOU0IsS
+PqEnJTBaO0FkCZwVEFdxK7B0+Bpc7d0fvhycHhRsNzUnHAKZBCA556WxkR9vakC4
++6/8q+WCQZxAyN8hl7kbOsPsXLWVVv+k5lRKQWA/6uK2dpTIWGh0osAqcB2ZuyKq
+gtXKgFVALs05v3Foah+vKlRUzHPabxS06woXIT/X+Fgu09BWgUP6c/fnChOMNbZ4
+udjC+vVPnfY31VFRS0Y+lzH8m2RRnVxYRM0hC2r57sETwmOGygq4TDwlKGtntSxH
+k1qlWGTLVVexIwJ0RG4wFlU6D6SS/3Mh1rsNjaEjnJwgidVgPKSDli+zyF6JARyz
+YPC3AgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB
+kzCBkDCBjaCBiqCBh4aBhGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv
+aXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4
+RUJEMiZzZz1IQUNDNDcxQjY1NDIyRTEyQjI3QTlEMzNBODdBRDFDREY1OTI2RTE0
+MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAjen+JuuCsf36njlCYFQavlIKGbReTiUg
+IcRU95R5b2o0eHRg3dp+BIZeixO1DhTPoS8WkA/1Ovl76rsPzR+mg/m9igEJhR3t
+E8x2rCc2c4j5CgfPV04uvwdGGZ0qaJ/XRV16PDIdNmPfoBIUcj/8bBA2sdmob29+
+3vAGwO5ubZTLVVrXJN0eWSCOHIV8GOxbfLFQzw4hjgCBGetsT2iPgKVElbWI81ui
+4zJg9xLDpDbU0C7YhFjPNr3IkqI8Qp60X9FTRF+rYW2B8Zw3hJSItaI+eIqQt0n2
+uz6243l01WsyTRowPMp4mBmiYbs+K0QkQM6Hd7PrMqWNK90E6tMrQg==
+-----END CERTIFICATE-----

admin/target/classes/apiclient_key.pem

@@ -0,0 +1,28 @@
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCthKmfULCDNE+3
+R7k5RytJM0Bsbd4Zeqe+z3A8KnOS4ddzbS0NAidc2c5vtELfSWHl+E2HBTqkD4mN
+uqoT2MKfad2YwKnJyCP+3d8oUC0ynsQXoLgBSHmyCyqbOZ+lhoQx2kIV74nRJhsI
+z5i4fjusmYK+8vEBsCoKbB/8ep5CehCdL3lCgrT7YLWSRNVOQI9hl9Sm8ACIUz+C
+Vyfp7Nvr80oCux84S4bvNN07Tabt6KSMwobcOKNO81QQ+6og2V28r14TlTtqujBt
+6uMFHXiFlanVd++wuz+x6zPhu1hYBTBGA2gZpDehAUQD+dHgWQKAWB/YCRxPocg4
+Io+/FgIFAgMBAAECggEAPHTGbL2+YlhtldwlivFjAYQb5Ct7gMEdhPvdjPj1f620
+VYEqeyfO8yjoJj9WNVnqBCg5StvljJflQz5QV83kMYq/LKOkBKv47qn7QJ5+wO5U
+QC89LSVFUWVWmPLAzvlJQd1bvSzShc6TCMTb3xwMSpzJ0yHuGrp4S11U37ERRvOR
+M0drJbK8pakdDXMfmRTaBI61AO98BMf3mvJYbbvL4u9w3Q7vHqIJDuWnMH7JNx/o
+z7Ykd4/kZJHFAMSftMww7DnZWxlmy/4sLnT44Fh/SrWgQxDRcjip6xczR/gjVZg5
++/6IoiXIvoPlRXEgPNlSEzhSjEck70+dLMfgk9n2wQKBgQDmqEEUmVw8wGrX3qmZ
+fkT/zWOv74PfsP0TS6EA9AF3xO7GwqD8PUO5/OYYx4nOFzLgHHyFb7rcjESD1qis
+31VSayC80oGOu5apesWIz0RXRsXydGRc+raflSEpNsa/IQLocsDPyKt6QID1FFvs
+F31iG46gxyowuETjHAztEXn26QKBgQDAlT8h8NCFAb2IPgrMGaibYUBNK8ptbyNy
+vsuj4Gnhx1M3+Mcadv4eD7fiUU02NTWIWZfp59tkRljfOPulxN6AIt1LHjN4ml1O
++cUk39d5gpAAphqV7aAJHugmtJqOhbHx2qdgxILaherixrxZ6XznFh+xG00AjSeG
+ArZvlHH4vQKBgDr0gIXyWPgSOnzopbLc6mfzqGo8rxlK1LTM3N8wfvuM83cMIje2
+tQvhzzJANkHd/hv4S/+TOlDK7WxBPqXJA7boONrqd0DzQ6QYBEteptoj9c5t34VA
+c9NAO9Sb8prBpkuhoRS69tFtkUiTJpemvV6JKqB/p5ICV2ExN0CU+faZAoGAIY4f
+qO9HtdUezA1bXkKeQSyJwqh9peG2gHjEDLK+YCuV0WvUbUUMc/pzJMjbtjVBNZe+
+w2+1p1wmggZwump6BkOM4VjKyRnEZk1Yz1r9NVvNcX9/pF36A3zSIGRZhbm/zo81
+mMPEtQSeb5MHIHdxXuZY8Uf7e7wchdoVJY3s6dUCgYEAs3Nr2HITPV88T6uWqTCu
+Y9H5iAOgh3nUKgVtEqqcDiDiZW/WOGFoiC2ERmMdAfq9pez/LifpBbGgRZgyFqDU
+KOorQk0nA6c2ycqIN57sF+v4AqdH/Kijzbjg8751/SDK3ZP3EOW6n07aVxcx4MQq
+Til1mtXx/275XG7NfFnA9Eg=
+-----END PRIVATE KEY-----

admin/target/classes/application.yml

@@ -2,6 +2,8 @@ server:
   port: 8099
   tomcat:
     uri-encoding: UTF-8
+  servlet:
+    context-path: /mapi
 app.id: aska-admin
 
 
@@ -44,5 +46,8 @@ wx:
   app-appid: wxe5251793c19a48d5
   mch-id: 1641830577
   api-key: a8babfa0d75ac878dd76dc905bf677e2
+  apiv3-key: 87b90c2065d9caa1c767ff1b15b21e52
+  api-serial-no: 22098B381BAE268F47FE823C70C3AA7702EE54C4
+  public-serial-no: 5BB0B8268EB289373EDFA3B1572FE3F2F8FD3B80
   unified-order-url: https://api.mch.weixin.qq.com/pay/unifiedorder
   notify-url: https://biketest.mofangchuxing.com/askay/notify

admin/target/classes/wechatpay.pem

@@ -0,0 +1,24 @@
+-----BEGIN CERTIFICATE-----
+MIIEFDCCAvygAwIBAgIUW7C4Jo6yiTc+36OxVy/j8vj9O4AwDQYJKoZIhvcNAQEL
+BQAwXjELMAkGA1UEBhMCQ04xEzARBgNVBAoTClRlbnBheS5jb20xHTAbBgNVBAsT
+FFRlbnBheS5jb20gQ0EgQ2VudGVyMRswGQYDVQQDExJUZW5wYXkuY29tIFJvb3Qg
+Q0EwHhcNMjMwNDEyMDE1NTQ3WhcNMjgwNDEwMDE1NTQ3WjBuMRgwFgYDVQQDDA9U
+ZW5wYXkuY29tIHNpZ24xEzARBgNVBAoMClRlbnBheS5jb20xHTAbBgNVBAsMFFRl
+bnBheS5jb20gQ0EgQ2VudGVyMQswCQYDVQQGDAJDTjERMA8GA1UEBwwIU2hlblpo
+ZW4wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD3iAUhkxTp/iOU0IsS
+PqEnJTBaO0FkCZwVEFdxK7B0+Bpc7d0fvhycHhRsNzUnHAKZBCA556WxkR9vakC4
++6/8q+WCQZxAyN8hl7kbOsPsXLWVVv+k5lRKQWA/6uK2dpTIWGh0osAqcB2ZuyKq
+gtXKgFVALs05v3Foah+vKlRUzHPabxS06woXIT/X+Fgu09BWgUP6c/fnChOMNbZ4
+udjC+vVPnfY31VFRS0Y+lzH8m2RRnVxYRM0hC2r57sETwmOGygq4TDwlKGtntSxH
+k1qlWGTLVVexIwJ0RG4wFlU6D6SS/3Mh1rsNjaEjnJwgidVgPKSDli+zyF6JARyz
+YPC3AgMBAAGjgbkwgbYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA/gwgZsGA1UdHwSB
+kzCBkDCBjaCBiqCBh4aBhGh0dHA6Ly9ldmNhLml0cnVzLmNvbS5jbi9wdWJsaWMv
+aXRydXNjcmw/Q0E9MUJENDIyMEU1MERCQzA0QjA2QUQzOTc1NDk4NDZDMDFDM0U4
+RUJEMiZzZz1IQUNDNDcxQjY1NDIyRTEyQjI3QTlEMzNBODdBRDFDREY1OTI2RTE0
+MDM3MTANBgkqhkiG9w0BAQsFAAOCAQEAjen+JuuCsf36njlCYFQavlIKGbReTiUg
+IcRU95R5b2o0eHRg3dp+BIZeixO1DhTPoS8WkA/1Ovl76rsPzR+mg/m9igEJhR3t
+E8x2rCc2c4j5CgfPV04uvwdGGZ0qaJ/XRV16PDIdNmPfoBIUcj/8bBA2sdmob29+
+3vAGwO5ubZTLVVrXJN0eWSCOHIV8GOxbfLFQzw4hjgCBGetsT2iPgKVElbWI81ui
+4zJg9xLDpDbU0C7YhFjPNr3IkqI8Qp60X9FTRF+rYW2B8Zw3hJSItaI+eIqQt0n2
+uz6243l01WsyTRowPMp4mBmiYbs+K0QkQM6Hd7PrMqWNK90E6tMrQg==
+-----END CERTIFICATE-----

admin/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -1,8 +1,10 @@
+com/mofangchuxing/aska/admin/Intercepter/RequestInterceptor.class
+com/mofangchuxing/aska/admin/controller/ChannelMngController.class
+com/mofangchuxing/aska/admin/controller/RetailController.class
 com/mofangchuxing/aska/admin/controller/AccountController.class
 com/mofangchuxing/aska/admin/config/WebConfig.class
 com/mofangchuxing/aska/admin/controller/ChannelController.class
-com/mofangchuxing/aska/admin/Intercepter/RequestInterceptor.class
 com/mofangchuxing/aska/admin/controller/SysUserController.class
-com/mofangchuxing/aska/admin/controller/RetailController.class
 com/mofangchuxing/aska/admin/controller/AdminBaseController.class
 com/mofangchuxing/aska/admin/AdminApplication.class
+com/mofangchuxing/aska/admin/controller/RetailMngController.class

admin/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -5,4 +5,6 @@
 /Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/Intercepter/RequestInterceptor.java
 /Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelController.java
 /Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/RetailMngController.java
+/Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/ChannelMngController.java
 /Users/syl/Desktop/work/aska/admin/src/main/java/com/mofangchuxing/aska/admin/controller/AccountController.java

dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaChannelnos.java

@@ -0,0 +1,175 @@
+package com.mofangchuxing.aska.dao.domain;
+
+import java.io.Serializable;
+
+/**
+ * 
+ * @TableName aska_channelnos
+ */
+public class AskaChannelnos implements Serializable {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 
+     */
+    private Integer channelId;
+
+    /**
+     * 
+     */
+    private String channelNo;
+
+    /**
+     * 渠道来源
+     */
+    private String channelName;
+
+    /**
+     * {在用,停用}
+     */
+    private String status;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * 
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 
+     */
+    public Integer getChannelId() {
+        return channelId;
+    }
+
+    /**
+     * 
+     */
+    public void setChannelId(Integer channelId) {
+        this.channelId = channelId;
+    }
+
+    /**
+     * 
+     */
+    public String getChannelNo() {
+        return channelNo;
+    }
+
+    /**
+     * 
+     */
+    public void setChannelNo(String channelNo) {
+        this.channelNo = channelNo;
+    }
+
+    /**
+     * 渠道来源
+     */
+    public String getChannelName() {
+        return channelName;
+    }
+
+    /**
+     * 渠道来源
+     */
+    public void setChannelName(String channelName) {
+        this.channelName = channelName;
+    }
+
+    /**
+     * {在用,停用}
+     */
+    public String getStatus() {
+        return status;
+    }
+
+    /**
+     * {在用,停用}
+     */
+    public void setStatus(String status) {
+        this.status = status;
+    }
+
+    /**
+     * 备注
+     */
+    public String getNote() {
+        return note;
+    }
+
+    /**
+     * 备注
+     */
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        AskaChannelnos other = (AskaChannelnos) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getChannelId() == null ? other.getChannelId() == null : this.getChannelId().equals(other.getChannelId()))
+            && (this.getChannelNo() == null ? other.getChannelNo() == null : this.getChannelNo().equals(other.getChannelNo()))
+            && (this.getChannelName() == null ? other.getChannelName() == null : this.getChannelName().equals(other.getChannelName()))
+            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
+            && (this.getNote() == null ? other.getNote() == null : this.getNote().equals(other.getNote()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getChannelId() == null) ? 0 : getChannelId().hashCode());
+        result = prime * result + ((getChannelNo() == null) ? 0 : getChannelNo().hashCode());
+        result = prime * result + ((getChannelName() == null) ? 0 : getChannelName().hashCode());
+        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
+        result = prime * result + ((getNote() == null) ? 0 : getNote().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", channelId=").append(channelId);
+        sb.append(", channelNo=").append(channelNo);
+        sb.append(", channelName=").append(channelName);
+        sb.append(", status=").append(status);
+        sb.append(", note=").append(note);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}

dao/src/main/java/com/mofangchuxing/aska/dao/domain/AskaSplitrecord.java

@@ -21,7 +21,7 @@ public class AskaSplitrecord implements Serializable {
     /**
      * 分账订单号
      */
-    private String spiltOrderId;
+    private String splitOrderId;
 
     /**
      * 流水类型 1-收入 2-退款
@@ -171,15 +171,15 @@ public class AskaSplitrecord implements Serializable {
     /**
      * 分账订单号
      */
-    public String getSpiltOrderId() {
-        return spiltOrderId;
+    public String getSplitOrderId() {
+        return splitOrderId;
     }
 
     /**
      * 分账订单号
      */
-    public void setSpiltOrderId(String spiltOrderId) {
-        this.spiltOrderId = spiltOrderId;
+    public void setSplitOrderId(String splitOrderId) {
+        this.splitOrderId = splitOrderId;
     }
 
     /**
@@ -518,7 +518,7 @@ public class AskaSplitrecord implements Serializable {
         AskaSplitrecord other = (AskaSplitrecord) that;
         return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
             && (this.getPayId() == null ? other.getPayId() == null : this.getPayId().equals(other.getPayId()))
-            && (this.getSpiltOrderId() == null ? other.getSpiltOrderId() == null : this.getSpiltOrderId().equals(other.getSpiltOrderId()))
+            && (this.getSplitOrderId() == null ? other.getSplitOrderId() == null : this.getSplitOrderId().equals(other.getSplitOrderId()))
             && (this.getRecordType() == null ? other.getRecordType() == null : this.getRecordType().equals(other.getRecordType()))
             && (this.getRefundOrderId() == null ? other.getRefundOrderId() == null : this.getRefundOrderId().equals(other.getRefundOrderId()))
             && (this.getPayAmount() == null ? other.getPayAmount() == null : this.getPayAmount().equals(other.getPayAmount()))
@@ -550,7 +550,7 @@ public class AskaSplitrecord implements Serializable {
         int result = 1;
         result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
         result = prime * result + ((getPayId() == null) ? 0 : getPayId().hashCode());
-        result = prime * result + ((getSpiltOrderId() == null) ? 0 : getSpiltOrderId().hashCode());
+        result = prime * result + ((getSplitOrderId() == null) ? 0 : getSplitOrderId().hashCode());
         result = prime * result + ((getRecordType() == null) ? 0 : getRecordType().hashCode());
         result = prime * result + ((getRefundOrderId() == null) ? 0 : getRefundOrderId().hashCode());
         result = prime * result + ((getPayAmount() == null) ? 0 : getPayAmount().hashCode());
@@ -585,7 +585,7 @@ public class AskaSplitrecord implements Serializable {
         sb.append("Hash = ").append(hashCode());
         sb.append(", id=").append(id);
         sb.append(", payId=").append(payId);
-        sb.append(", spiltOrderId=").append(spiltOrderId);
+        sb.append(", spiltOrderId=").append(splitOrderId);
         sb.append(", recordType=").append(recordType);
         sb.append(", refundOrderId=").append(refundOrderId);
         sb.append(", payAmount=").append(payAmount);

dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelcouponnosMapper.java

@@ -1,8 +1,11 @@
 package com.mofangchuxing.aska.dao.mapper;
 
 import com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos;
+import com.mofangchuxing.aska.domain.dto.ChannelCouponDto;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
 * @author syl
 * @description 针对表【aska_channelCouponNos(抵扣券)】的数据库操作Mapper
@@ -24,4 +27,6 @@ public interface AskaChannelcouponnosMapper {
     int updateByPrimaryKey(AskaChannelcouponnos record);
 
     AskaChannelcouponnos searchAllByCouponNo(@Param("couponNo") String couponNo);
+
+    List<AskaChannelcouponnos> searchAll(ChannelCouponDto channelCouponDto);
 }

dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelnosMapper.java

@@ -0,0 +1,29 @@
+package com.mofangchuxing.aska.dao.mapper;
+
+import com.mofangchuxing.aska.dao.domain.AskaChannelnos;
+import com.mofangchuxing.aska.domain.dto.ChannelCouponDto;
+
+import java.util.List;
+
+/**
+* @author syl
+* @description 针对表【aska_channelnos】的数据库操作Mapper
+* @createDate 2023-08-31 09:45:33
+* @Entity com.mofangchuxing.aska.dao.domain.AskaChannelnos
+*/
+public interface AskaChannelnosMapper {
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AskaChannelnos record);
+
+    int insertSelective(AskaChannelnos record);
+
+    AskaChannelnos selectByPrimaryKey(Long id);
+
+    int updateByPrimaryKeySelective(AskaChannelnos record);
+
+    int updateByPrimaryKey(AskaChannelnos record);
+
+    List<AskaChannelnos> searchAll(ChannelCouponDto channelCouponDto);
+}

dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaChannelsMapper.java

@@ -2,6 +2,7 @@ package com.mofangchuxing.aska.dao.mapper;
 
 import com.mofangchuxing.aska.dao.domain.AskaChannels;
 import com.mofangchuxing.aska.domain.dto.ChannelDto;
+import com.mofangchuxing.aska.domain.vo.AskaChannelsVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -26,5 +27,7 @@ public interface AskaChannelsMapper {
 
     int updateByPrimaryKey(AskaChannels record);
 
-    List<AskaChannels> getAllChannels(ChannelDto channelDto);
+    List<AskaChannelsVo> getAllChannels(ChannelDto channelDto);
+
+    AskaChannelsVo selectByOwnerId(@Param("ownerId") Integer ownerId);
 }

dao/src/main/java/com/mofangchuxing/aska/dao/mapper/AskaRetailsMapper.java

@@ -29,4 +29,6 @@ public interface AskaRetailsMapper {
     List<AskaRetailsVo> listAllRetails(RetailDto retailDto);
 
     List<AskaRetailsVo> listAllRetailsNoLimit();
+
+    AskaRetailsVo selectByOwnerId(Integer ownerId);
 }

dao/src/main/java/com/mofangchuxing/aska/dao/mapper/PayRequestMapper.java

@@ -1,9 +1,11 @@
 package com.mofangchuxing.aska.dao.mapper;
 
 import com.mofangchuxing.aska.dao.domain.PayRequest;
+import com.mofangchuxing.aska.domain.dto.OrderDto;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * @author syl
@@ -33,4 +35,5 @@ public interface PayRequestMapper {
 
     List<PayRequest> selectByOrderId(@Param("phoneNo")String mobile, @Param("orderId") String orderId);
 
+    List<Map<String,Object>> getOrderList(OrderDto orderDto);
 }

dao/src/main/resources/mapper/AskaChannelcouponnosMapper.xml

@@ -24,22 +24,38 @@
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from aska_channelCouponNos
+        from aska_channelcouponnos
         where  id = #{id,jdbcType=INTEGER} 
     </select>
     <select id="searchAllByCouponNo" resultType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
         select
         <include refid="Base_Column_List" />
-        from aska_channelCouponNos
+        from aska_channelcouponnos
         where couponNo = #{couponNo} limit 1
     </select>
+    <select id="searchAll" resultType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
+        select
+        <include refid="Base_Column_List" />
+        from aska_channelcouponnos
+        where 1=1
+        <if test="channelId != null and channelId != ''">
+            and channelId = #{channelId}
+        </if>
+        <if test="couponNo != null and couponNo != ''">
+            and couponNo = #{couponNo}
+        </if>
+        <if test="status != null and status != '' and status != '全部'">
+            and status = #{status}
+        </if>
+        order by id desc
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete from aska_channelCouponNos
+        delete from aska_channelcouponnos
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos" useGeneratedKeys="true">
-        insert into aska_channelCouponNos
+        insert into aska_channelcouponnos
         ( id,channelId,channelNo
         ,couponNo,status,outDate
         ,value,price)
@@ -48,7 +64,7 @@
         ,#{value,jdbcType=INTEGER},#{price,jdbcType=INTEGER})
     </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos" useGeneratedKeys="true">
-        insert into aska_channelCouponNos
+        insert into aska_channelcouponnos
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
                 <if test="channelId != null">channelId,</if>
@@ -71,7 +87,7 @@
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
-        update aska_channelCouponNos
+        update aska_channelcouponnos
         <set>
                 <if test="channelId != null">
                     channelId = #{channelId,jdbcType=INTEGER},
@@ -98,7 +114,7 @@
         where   id = #{id,jdbcType=INTEGER} 
     </update>
     <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
-        update aska_channelCouponNos
+        update aska_channelcouponnos
         set 
             channelId =  #{channelId,jdbcType=INTEGER},
             channelNo =  #{channelNo,jdbcType=CHAR},

dao/src/main/resources/mapper/AskaChannelnosMapper.xml

@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.mofangchuxing.aska.dao.mapper.AskaChannelnosMapper">
+
+    <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.AskaChannelnos">
+            <id property="id" column="id" jdbcType="INTEGER"/>
+            <result property="channelId" column="channelId" jdbcType="INTEGER"/>
+            <result property="channelNo" column="channelNo" jdbcType="CHAR"/>
+            <result property="channelName" column="channelName" jdbcType="CHAR"/>
+            <result property="status" column="status" jdbcType="CHAR"/>
+            <result property="note" column="note" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,channelId,channelNo,
+        channelName,status,note
+    </sql>
+
+    <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from aska_channelnos
+        where  id = #{id,jdbcType=INTEGER} 
+    </select>
+    <select id="searchAll" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from aska_channelnos
+        where 1=1
+        <if test="channelId != null and channelId != ''">
+            and channelId = #{channelId}
+        </if>
+    </select>
+
+    <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
+        delete from aska_channelnos
+        where  id = #{id,jdbcType=INTEGER} 
+    </delete>
+    <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos" useGeneratedKeys="true">
+        insert into aska_channelnos
+        ( id,channelId,channelNo
+        ,channelName,status,note
+        )
+        values (#{id,jdbcType=INTEGER},#{channelId,jdbcType=INTEGER},#{channelNo,jdbcType=CHAR}
+        ,#{channelName,jdbcType=CHAR},#{status,jdbcType=CHAR},#{note,jdbcType=VARCHAR}
+        )
+    </insert>
+    <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos" useGeneratedKeys="true">
+        insert into aska_channelnos
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+                <if test="id != null">id,</if>
+                <if test="channelId != null">channelId,</if>
+                <if test="channelNo != null">channelNo,</if>
+                <if test="channelName != null">channelName,</if>
+                <if test="status != null">status,</if>
+                <if test="note != null">note,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+                <if test="id != null">#{id,jdbcType=INTEGER},</if>
+                <if test="channelId != null">#{channelId,jdbcType=INTEGER},</if>
+                <if test="channelNo != null">#{channelNo,jdbcType=CHAR},</if>
+                <if test="channelName != null">#{channelName,jdbcType=CHAR},</if>
+                <if test="status != null">#{status,jdbcType=CHAR},</if>
+                <if test="note != null">#{note,jdbcType=VARCHAR},</if>
+        </trim>
+    </insert>
+    <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos">
+        update aska_channelnos
+        <set>
+                <if test="channelId != null">
+                    channelId = #{channelId,jdbcType=INTEGER},
+                </if>
+                <if test="channelNo != null">
+                    channelNo = #{channelNo,jdbcType=CHAR},
+                </if>
+                <if test="channelName != null">
+                    channelName = #{channelName,jdbcType=CHAR},
+                </if>
+                <if test="status != null">
+                    status = #{status,jdbcType=CHAR},
+                </if>
+                <if test="note != null">
+                    note = #{note,jdbcType=VARCHAR},
+                </if>
+        </set>
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+    <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelnos">
+        update aska_channelnos
+        set 
+            channelId =  #{channelId,jdbcType=INTEGER},
+            channelNo =  #{channelNo,jdbcType=CHAR},
+            channelName =  #{channelName,jdbcType=CHAR},
+            status =  #{status,jdbcType=CHAR},
+            note =  #{note,jdbcType=VARCHAR}
+        where   id = #{id,jdbcType=INTEGER} 
+    </update>
+</mapper>

dao/src/main/resources/mapper/AskaChannelsMapper.xml

@@ -45,13 +45,16 @@
         where  id = #{id,jdbcType=INTEGER} 
     </select>
 
-    <select id="getAllChannels" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from aska_channels
-        where 1=1 <if test="channelName != null">
-        and name = #{channelName,jdbcType=CHAR},
-    </if>
+    <select id="getAllChannels" resultType="com.mofangchuxing.aska.domain.vo.AskaChannelsVo">
+        select ac.*,aa.name as username
+        from aska_channels ac left join aska_accounts aa on ac.ownerId = aa.id
+        where 1=1
+        <if test="channelName != null and channelName != ''">
+            and name = #{channelName,jdbcType=VARCHAR}
+        </if>
+    </select>
+    <select id="selectByOwnerId" resultType="com.mofangchuxing.aska.domain.vo.AskaChannelsVo">
+        select id as channelId,name as channelName from aska_channels where ownerId = #{ownerId} limit 1
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

dao/src/main/resources/mapper/AskaRetailsMapper.xml

@@ -51,14 +51,17 @@
 
     <select id="listAllRetails" resultType="com.mofangchuxing.aska.domain.vo.AskaRetailsVo">
         select
-        <include refid="Base_Column_List" />
-        from aska_retails
+        ar.*,aa.name as username
+        from aska_retails ar left join aska_accounts aa on ar.ownerId = aa.id
         where 1=1
-        <if test="name != null">
-            and name = #{name}
+        <if test="name != null and name != ''">
+            and ar.name = #{name}
+        </if>
+        <if test="retailType != null and retailType != ''">
+            and ar.retail_type = #{retailType}
         </if>
         <if test="status != null">
-            and status = #{status}
+            and ar.status = #{status}
         </if>
     </select>
     <select id="listAllRetailsNoLimit" resultType="com.mofangchuxing.aska.domain.vo.AskaRetailsVo">
@@ -67,6 +70,9 @@
                lat,lng,address,status
         from aska_retails
     </select>
+    <select id="selectByOwnerId" resultType="com.mofangchuxing.aska.domain.vo.AskaRetailsVo">
+        select id as retailId,name as retailName from aska_retails where ownerId = #{ownerId} limit 1
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from aska_retails

dao/src/main/resources/mapper/AskaSplitrecordMapper.xml

@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.AskaSplitrecord">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="payId" column="payId" jdbcType="INTEGER"/>
-            <result property="spiltOrderId" column="spiltOrderId" jdbcType="VARCHAR"/>
+            <result property="splitOrderId" column="splitOrderId" jdbcType="VARCHAR"/>
             <result property="recordType" column="recordType" jdbcType="INTEGER"/>
             <result property="refundOrderId" column="refundOrderId" jdbcType="INTEGER"/>
             <result property="payAmount" column="payAmount" jdbcType="INTEGER"/>
@@ -34,7 +34,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,payId,spiltOrderId,
+        id,payId,splitOrderId,
         recordType,refundOrderId,payAmount,
         retailId,retailName,retailAccount,
         retailAmount,retailRealtimeAmount,retailAccountAmount,
@@ -63,7 +63,7 @@
     </delete>
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaSplitrecord" useGeneratedKeys="true">
         insert into aska_splitRecord
-        ( id,payId,spiltOrderId
+        ( id,payId,splitOrderId
         ,recordType,refundOrderId,payAmount
         ,retailId,retailName,retailAccount
         ,retailAmount,retailRealtimeAmount,retailAccountAmount
@@ -72,7 +72,7 @@
         ,channelAccountAmount,channelSplitRule,status
         ,createTime,hasRefund,refundTotal
         ,refundRetail,refundChannel)
-        values (#{id,jdbcType=INTEGER},#{payId,jdbcType=INTEGER},#{spiltOrderId,jdbcType=VARCHAR}
+        values (#{id,jdbcType=INTEGER},#{payId,jdbcType=INTEGER},#{splitOrderId,jdbcType=VARCHAR}
         ,#{recordType,jdbcType=INTEGER},#{refundOrderId,jdbcType=INTEGER},#{payAmount,jdbcType=INTEGER}
         ,#{retailId,jdbcType=INTEGER},#{retailName,jdbcType=VARCHAR},#{retailAccount,jdbcType=VARCHAR}
         ,#{retailAmount,jdbcType=VARCHAR},#{retailRealtimeAmount,jdbcType=INTEGER},#{retailAccountAmount,jdbcType=INTEGER}
@@ -87,7 +87,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
                 <if test="payId != null">payId,</if>
-                <if test="spiltOrderId != null">spiltOrderId,</if>
+                <if test="splitOrderId != null">splitOrderId,</if>
                 <if test="recordType != null">recordType,</if>
                 <if test="refundOrderId != null">refundOrderId,</if>
                 <if test="payAmount != null">payAmount,</if>
@@ -115,7 +115,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null">#{id,jdbcType=INTEGER},</if>
                 <if test="payId != null">#{payId,jdbcType=INTEGER},</if>
-                <if test="spiltOrderId != null">#{spiltOrderId,jdbcType=VARCHAR},</if>
+                <if test="splitOrderId != null">#{splitOrderId,jdbcType=VARCHAR},</if>
                 <if test="recordType != null">#{recordType,jdbcType=INTEGER},</if>
                 <if test="refundOrderId != null">#{refundOrderId,jdbcType=INTEGER},</if>
                 <if test="payAmount != null">#{payAmount,jdbcType=INTEGER},</if>
@@ -147,8 +147,8 @@
                 <if test="payId != null">
                     payId = #{payId,jdbcType=INTEGER},
                 </if>
-                <if test="spiltOrderId != null">
-                    spiltOrderId = #{spiltOrderId,jdbcType=VARCHAR},
+                <if test="splitOrderId != null">
+                    splitOrderId = #{splitOrderId,jdbcType=VARCHAR},
                 </if>
                 <if test="recordType != null">
                     recordType = #{recordType,jdbcType=INTEGER},
@@ -226,7 +226,7 @@
         update aska_splitRecord
         set 
             payId =  #{payId,jdbcType=INTEGER},
-            spiltOrderId =  #{spiltOrderId,jdbcType=VARCHAR},
+            splitOrderId =  #{splitOrderId,jdbcType=VARCHAR},
             recordType =  #{recordType,jdbcType=INTEGER},
             refundOrderId =  #{refundOrderId,jdbcType=INTEGER},
             payAmount =  #{payAmount,jdbcType=INTEGER},

dao/src/main/resources/mapper/PayRequestMapper.xml

@@ -79,7 +79,23 @@
         from pay_request
         where mobile = #{phoneNo} and order_id = #{orderId}
     </select>
-
+    <select id="getOrderList" resultType="java.util.Map">
+        select pr.*,asr.* from pay_request pr left join aska_splitrecord as asr on pr.id = asr.payId
+        where 1=1
+        <if test="retailId != null and retailId != ''">
+            and pr.retail_id = #{retailId}
+        </if>
+        <if test="couponNo != null and couponNo != ''">
+            and pr.use_coupon_id = #{couponNo}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and pr.order_id = #{orderNo}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and pr.channel_id = #{channelId}
+        </if>
+        order by pr.id desc
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from pay_request

dao/target/classes/mapper/AskaChannelcouponnosMapper.xml

@@ -24,22 +24,38 @@
     <select id="selectByPrimaryKey" parameterType="java.lang.Long" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from aska_channelCouponNos
+        from aska_channelcouponnos
         where  id = #{id,jdbcType=INTEGER} 
     </select>
     <select id="searchAllByCouponNo" resultType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
         select
         <include refid="Base_Column_List" />
-        from aska_channelCouponNos
+        from aska_channelcouponnos
         where couponNo = #{couponNo} limit 1
     </select>
+    <select id="searchAll" resultType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
+        select
+        <include refid="Base_Column_List" />
+        from aska_channelcouponnos
+        where 1=1
+        <if test="channelId != null and channelId != ''">
+            and channelId = #{channelId}
+        </if>
+        <if test="couponNo != null and couponNo != ''">
+            and couponNo = #{couponNo}
+        </if>
+        <if test="status != null and status != '' and status != '全部'">
+            and status = #{status}
+        </if>
+        order by id desc
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
-        delete from aska_channelCouponNos
+        delete from aska_channelcouponnos
         where  id = #{id,jdbcType=INTEGER} 
     </delete>
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos" useGeneratedKeys="true">
-        insert into aska_channelCouponNos
+        insert into aska_channelcouponnos
         ( id,channelId,channelNo
         ,couponNo,status,outDate
         ,value,price)
@@ -48,7 +64,7 @@
         ,#{value,jdbcType=INTEGER},#{price,jdbcType=INTEGER})
     </insert>
     <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos" useGeneratedKeys="true">
-        insert into aska_channelCouponNos
+        insert into aska_channelcouponnos
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
                 <if test="channelId != null">channelId,</if>
@@ -71,7 +87,7 @@
         </trim>
     </insert>
     <update id="updateByPrimaryKeySelective" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
-        update aska_channelCouponNos
+        update aska_channelcouponnos
         <set>
                 <if test="channelId != null">
                     channelId = #{channelId,jdbcType=INTEGER},
@@ -98,7 +114,7 @@
         where   id = #{id,jdbcType=INTEGER} 
     </update>
     <update id="updateByPrimaryKey" parameterType="com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos">
-        update aska_channelCouponNos
+        update aska_channelcouponnos
         set 
             channelId =  #{channelId,jdbcType=INTEGER},
             channelNo =  #{channelNo,jdbcType=CHAR},

dao/target/classes/mapper/AskaChannelsMapper.xml

@@ -45,13 +45,16 @@
         where  id = #{id,jdbcType=INTEGER} 
     </select>
 
-    <select id="getAllChannels" resultMap="BaseResultMap">
-        select
-        <include refid="Base_Column_List" />
-        from aska_channels
-        where 1=1 <if test="channelName != null">
-        and name = #{channelName,jdbcType=CHAR},
-    </if>
+    <select id="getAllChannels" resultType="com.mofangchuxing.aska.domain.vo.AskaChannelsVo">
+        select ac.*,aa.name as username
+        from aska_channels ac left join aska_accounts aa on ac.ownerId = aa.id
+        where 1=1
+        <if test="channelName != null and channelName != ''">
+            and name = #{channelName,jdbcType=VARCHAR}
+        </if>
+    </select>
+    <select id="selectByOwnerId" resultType="com.mofangchuxing.aska.domain.vo.AskaChannelsVo">
+        select id as channelId,name as channelName from aska_channels where ownerId = #{ownerId} limit 1
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">

dao/target/classes/mapper/AskaRetailsMapper.xml

@@ -51,14 +51,17 @@
 
     <select id="listAllRetails" resultType="com.mofangchuxing.aska.domain.vo.AskaRetailsVo">
         select
-        <include refid="Base_Column_List" />
-        from aska_retails
+        ar.*,aa.name as username
+        from aska_retails ar left join aska_accounts aa on ar.ownerId = aa.id
         where 1=1
-        <if test="name != null">
-            and name = #{name}
+        <if test="name != null and name != ''">
+            and ar.name = #{name}
+        </if>
+        <if test="retailType != null and retailType != ''">
+            and ar.retail_type = #{retailType}
         </if>
         <if test="status != null">
-            and status = #{status}
+            and ar.status = #{status}
         </if>
     </select>
     <select id="listAllRetailsNoLimit" resultType="com.mofangchuxing.aska.domain.vo.AskaRetailsVo">
@@ -67,6 +70,9 @@
                lat,lng,address,status
         from aska_retails
     </select>
+    <select id="selectByOwnerId" resultType="com.mofangchuxing.aska.domain.vo.AskaRetailsVo">
+        select id as retailId,name as retailName from aska_retails where ownerId = #{ownerId} limit 1
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from aska_retails

dao/target/classes/mapper/AskaSplitrecordMapper.xml

@@ -7,7 +7,7 @@
     <resultMap id="BaseResultMap" type="com.mofangchuxing.aska.dao.domain.AskaSplitrecord">
             <id property="id" column="id" jdbcType="INTEGER"/>
             <result property="payId" column="payId" jdbcType="INTEGER"/>
-            <result property="spiltOrderId" column="spiltOrderId" jdbcType="VARCHAR"/>
+            <result property="splitOrderId" column="splitOrderId" jdbcType="VARCHAR"/>
             <result property="recordType" column="recordType" jdbcType="INTEGER"/>
             <result property="refundOrderId" column="refundOrderId" jdbcType="INTEGER"/>
             <result property="payAmount" column="payAmount" jdbcType="INTEGER"/>
@@ -34,7 +34,7 @@
     </resultMap>
 
     <sql id="Base_Column_List">
-        id,payId,spiltOrderId,
+        id,payId,splitOrderId,
         recordType,refundOrderId,payAmount,
         retailId,retailName,retailAccount,
         retailAmount,retailRealtimeAmount,retailAccountAmount,
@@ -63,7 +63,7 @@
     </delete>
     <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.mofangchuxing.aska.dao.domain.AskaSplitrecord" useGeneratedKeys="true">
         insert into aska_splitRecord
-        ( id,payId,spiltOrderId
+        ( id,payId,splitOrderId
         ,recordType,refundOrderId,payAmount
         ,retailId,retailName,retailAccount
         ,retailAmount,retailRealtimeAmount,retailAccountAmount
@@ -72,7 +72,7 @@
         ,channelAccountAmount,channelSplitRule,status
         ,createTime,hasRefund,refundTotal
         ,refundRetail,refundChannel)
-        values (#{id,jdbcType=INTEGER},#{payId,jdbcType=INTEGER},#{spiltOrderId,jdbcType=VARCHAR}
+        values (#{id,jdbcType=INTEGER},#{payId,jdbcType=INTEGER},#{splitOrderId,jdbcType=VARCHAR}
         ,#{recordType,jdbcType=INTEGER},#{refundOrderId,jdbcType=INTEGER},#{payAmount,jdbcType=INTEGER}
         ,#{retailId,jdbcType=INTEGER},#{retailName,jdbcType=VARCHAR},#{retailAccount,jdbcType=VARCHAR}
         ,#{retailAmount,jdbcType=VARCHAR},#{retailRealtimeAmount,jdbcType=INTEGER},#{retailAccountAmount,jdbcType=INTEGER}
@@ -87,7 +87,7 @@
         <trim prefix="(" suffix=")" suffixOverrides=",">
                 <if test="id != null">id,</if>
                 <if test="payId != null">payId,</if>
-                <if test="spiltOrderId != null">spiltOrderId,</if>
+                <if test="splitOrderId != null">splitOrderId,</if>
                 <if test="recordType != null">recordType,</if>
                 <if test="refundOrderId != null">refundOrderId,</if>
                 <if test="payAmount != null">payAmount,</if>
@@ -115,7 +115,7 @@
         <trim prefix="values (" suffix=")" suffixOverrides=",">
                 <if test="id != null">#{id,jdbcType=INTEGER},</if>
                 <if test="payId != null">#{payId,jdbcType=INTEGER},</if>
-                <if test="spiltOrderId != null">#{spiltOrderId,jdbcType=VARCHAR},</if>
+                <if test="splitOrderId != null">#{splitOrderId,jdbcType=VARCHAR},</if>
                 <if test="recordType != null">#{recordType,jdbcType=INTEGER},</if>
                 <if test="refundOrderId != null">#{refundOrderId,jdbcType=INTEGER},</if>
                 <if test="payAmount != null">#{payAmount,jdbcType=INTEGER},</if>
@@ -147,8 +147,8 @@
                 <if test="payId != null">
                     payId = #{payId,jdbcType=INTEGER},
                 </if>
-                <if test="spiltOrderId != null">
-                    spiltOrderId = #{spiltOrderId,jdbcType=VARCHAR},
+                <if test="splitOrderId != null">
+                    splitOrderId = #{splitOrderId,jdbcType=VARCHAR},
                 </if>
                 <if test="recordType != null">
                     recordType = #{recordType,jdbcType=INTEGER},
@@ -226,7 +226,7 @@
         update aska_splitRecord
         set 
             payId =  #{payId,jdbcType=INTEGER},
-            spiltOrderId =  #{spiltOrderId,jdbcType=VARCHAR},
+            splitOrderId =  #{splitOrderId,jdbcType=VARCHAR},
             recordType =  #{recordType,jdbcType=INTEGER},
             refundOrderId =  #{refundOrderId,jdbcType=INTEGER},
             payAmount =  #{payAmount,jdbcType=INTEGER},

dao/target/classes/mapper/PayRequestMapper.xml

@@ -79,7 +79,23 @@
         from pay_request
         where mobile = #{phoneNo} and order_id = #{orderId}
     </select>
-
+    <select id="getOrderList" resultType="java.util.Map">
+        select pr.*,asr.* from pay_request pr left join aska_splitrecord as asr on pr.id = asr.payId
+        where 1=1
+        <if test="retailId != null and retailId != ''">
+            and pr.retail_id = #{retailId}
+        </if>
+        <if test="couponNo != null and couponNo != ''">
+            and pr.use_coupon_id = #{couponNo}
+        </if>
+        <if test="orderNo != null and orderNo != ''">
+            and pr.order_id = #{orderNo}
+        </if>
+        <if test="channelId != null and channelId != ''">
+            and pr.channel_id = #{channelId}
+        </if>
+        order by pr.id desc
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from pay_request

domain/src/main/java/com/mofangchuxing/aska/domain/dto/AccountDto.java

@@ -2,6 +2,8 @@ package com.mofangchuxing.aska.domain.dto;
 
 import lombok.Data;
 
+import javax.validation.constraints.NotEmpty;
+
 /**
  * @Author: syl
  * @Date: 2023/8/15
@@ -12,4 +14,14 @@ public class AccountDto extends BaseDto{
     private Integer id;
 
     private String role;
+
+    @NotEmpty(message = "账号不能为空")
+    private String name;
+
+    private String note;
+
+    @NotEmpty(message = "密码不能为空")
+    private String password;
+    @NotEmpty(message = "手机号不能为空")
+    private String phone;
 }

domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelCouponDto.java

@@ -0,0 +1,26 @@
+package com.mofangchuxing.aska.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/29
+ * @Description:
+ */
+@Data
+public class ChannelCouponDto extends BaseDto{
+
+    private String channelId;
+
+    private String couponNo;
+
+    private Boolean download;
+
+    private String endDate;
+
+    private String startDate;
+
+    private String status;
+
+    private String channelNo;
+}

domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelNoDto.java

@@ -0,0 +1,20 @@
+package com.mofangchuxing.aska.domain.dto;
+
+import lombok.Data;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/31
+ * @Description:
+ */
+@Data
+public class ChannelNoDto extends BaseDto{
+
+    private String channelId;
+
+    private String channelName;
+
+    private String channelNo;
+
+    private String note;
+}

domain/src/main/java/com/mofangchuxing/aska/domain/dto/OrderDto.java

@@ -0,0 +1,28 @@
+package com.mofangchuxing.aska.domain.dto;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/23
+ * @Description:
+ */
+@Data
+public class OrderDto extends BaseDto{
+
+    private String retailId;
+
+    private String couponNo;
+
+    private Boolean download;
+
+    private Date endTime;
+
+    private String orderNo;
+
+    private Date startTime;
+
+    private String channelId;
+}

domain/src/main/java/com/mofangchuxing/aska/domain/dto/RetailDto.java

@@ -2,6 +2,8 @@ package com.mofangchuxing.aska.domain.dto;
 
 import lombok.Data;
 
+import java.util.Date;
+
 /**
  * @Author: syl
  * @Date: 2023/8/1
@@ -35,4 +37,6 @@ public class RetailDto extends BaseDto{
     private String tripartite;
 
     private String tripvalue;
+
+    private String retailType;
 }

domain/src/main/java/com/mofangchuxing/aska/domain/utils/PageUtils.java

@@ -18,7 +18,7 @@ public class PageUtils implements Serializable {
 	//总页数
 	private int totalPage;
 	//当前页数
-	private int currPage;
+	private int pageNum;
 	//列表数据
 	private List<?> list;
 	
@@ -32,13 +32,13 @@ public class PageUtils implements Serializable {
 	 * @param list        列表数据
 	 * @param totalCount  总记录数
 	 * @param pageSize    每页记录数
-	 * @param currPage    当前页数
+	 * @param pageNum    当前页数
 	 */
-	public PageUtils(List<?> list, int totalCount, int pageSize, int currPage) {
+	public PageUtils(List<?> list, int totalCount, int pageSize, int pageNum) {
 		this.list = list;
 		this.totalCount = totalCount;
 		this.pageSize = pageSize;
-		this.currPage = currPage;
+		this.pageNum = pageNum;
 		this.totalPage = (int)Math.ceil((double)totalCount/pageSize);
 	}
 
@@ -49,7 +49,7 @@ public class PageUtils implements Serializable {
 		this.list = page.getRecords();
 		this.totalCount = page.getTotal();
 		this.pageSize = page.getSize();
-		this.currPage = page.getCurrent();
+		this.pageNum = page.getCurrent();
 		this.totalPage = page.getPages();
 	}
 
@@ -77,12 +77,12 @@ public class PageUtils implements Serializable {
 		this.totalPage = totalPage;
 	}
 
-	public int getCurrPage() {
-		return currPage;
+	public int getPageNum() {
+		return pageNum;
 	}
 
-	public void setCurrPage(int currPage) {
-		this.currPage = currPage;
+	public void setPageNum(int pageNum) {
+		this.pageNum = pageNum;
 	}
 
 	public List<?> getList() {

domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaChannelsVo.java

@@ -0,0 +1,122 @@
+package com.mofangchuxing.aska.domain.vo;
+
+import lombok.Data;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/22
+ * @Description:
+ */
+@Data
+public class AskaChannelsVo {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private String name;
+
+    /**
+     *
+     */
+    private String prefix;
+
+    /**
+     * 渠道负责人id
+     */
+    private Integer ownerId;
+
+    /**
+     *
+     */
+    private String phone;
+
+    /**
+     * 备注
+     */
+    private String note;
+
+    /**
+     * 收款账号
+     */
+    private String account;
+
+    /**
+     *
+     */
+    private String accountName;
+
+    /**
+     * {personal,merchant}
+     */
+    private String accountType;
+
+    /**
+     * {store,store_owner,staff,partner}
+     */
+    private String relation;
+
+    /**
+     *
+     */
+    private String apiv3;
+
+    /**
+     *
+     */
+    private String certPath;
+
+    /**
+     * 分账方式{定额,定比}
+     */
+    private String tripartite;
+
+    /**
+     * 分账值{定额:分,定比:千分之一}
+     */
+    private Integer tripvalue;
+
+    /**
+     * 是否实时分账
+     */
+    private Integer realtimeSplit;
+
+    /**
+     * 渠道可用状态
+     */
+    private String status;
+
+    /**
+     * 收入总额
+     */
+    private Integer totalIncome;
+
+    /**
+     * 实时分账总额
+     */
+    private Integer totalSplit;
+
+    /**
+     * 提现总额
+     */
+    private Integer totalCashOut;
+
+    /**
+     * 退款总额
+     */
+    private Integer totalRefund;
+
+    /**
+     * 余额
+     */
+    private Integer balance;
+
+    private String username;
+
+    private String channelId;
+
+    private String channelName;
+}

domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaRetailsVo.java

@@ -128,8 +128,13 @@ public class AskaRetailsVo {
      */
     private Integer totalRefund;
 
+    private Integer totalIncome;
+
     /**
      * 余额
      */
     private Integer balance;
+
+    private String username;
+
 }

domain/src/main/java/com/mofangchuxing/aska/domain/vo/PayRequestVo.java

@@ -0,0 +1,142 @@
+package com.mofangchuxing.aska.domain.vo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/23
+ * @Description:
+ */
+@Data
+public class PayRequestVo {
+    /**
+     *
+     */
+    private Integer id;
+
+    /**
+     *
+     */
+    private String requestBody;
+
+    /**
+     *
+     */
+    private String orderSn;
+
+    /**
+     *
+     */
+    private String openId;
+
+    /**
+     *
+     */
+    private String mobile;
+
+    /**
+     *
+     */
+    private String orderId;
+
+    /**
+     *
+     */
+    private Integer amount;
+
+    /**
+     * 商品id
+     */
+    private String itemId;
+
+    /**
+     * 商品类型
+     */
+    private Integer itemType;
+
+    /**
+     *
+     */
+    private String itemName;
+
+    /**
+     *
+     */
+    private String itemChannel;
+
+    private Integer channelId;
+
+    /**
+     *
+     */
+    private String retailId;
+
+    /**
+     *
+     */
+    private String retailName;
+
+    /**
+     *
+     */
+    private String useCouponId;
+
+    /**
+     * 支付渠道 1-微信 2-支付宝
+     */
+    private Integer payChannel;
+
+    /**
+     *
+     */
+    private String responseBody;
+
+    /**
+     * 0-未支付 1-已支付
+     */
+    private Integer payStatus;
+
+    /**
+     * 支付时间
+     */
+    private Date payTime;
+
+    /**
+     *
+     */
+    private String transactionId;
+
+    /**
+     * 支付金额
+     */
+    private Integer payAmount;
+
+    /**
+     * 是否有退款
+     */
+    private Integer hasRefund;
+
+    /**
+     * 如果有退款，则退款总额
+     */
+    private Integer refundTotal;
+
+    /**
+     *
+     */
+    private String clientType;
+
+    /**
+     *
+     */
+    private Integer cansplit;
+
+    /**
+     *
+     */
+    private String callbackUrl;
+
+    private Date createTime;
+}

domain/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -5,7 +5,9 @@ com/mofangchuxing/aska/domain/utils/PageUtils.class
 com/mofangchuxing/aska/domain/dto/LoginDto.class
 com/mofangchuxing/aska/domain/ResponseResult.class
 com/mofangchuxing/aska/domain/enums/PayStatusEnum.class
+com/mofangchuxing/aska/domain/vo/AskaChannelsVo.class
 com/mofangchuxing/aska/domain/Constant$MenuType.class
+com/mofangchuxing/aska/domain/vo/PayRequestVo.class
 com/mofangchuxing/aska/domain/dto/AccountDto.class
 com/mofangchuxing/aska/domain/entity/SysMenuEntity$SysMenuEntityBuilder.class
 com/mofangchuxing/aska/domain/dto/ChannelDto.class
@@ -14,6 +16,7 @@ com/mofangchuxing/aska/domain/enums/ResultEnum.class
 com/mofangchuxing/aska/domain/DelayObjectWrapper.class
 com/mofangchuxing/aska/domain/R.class
 com/mofangchuxing/aska/domain/dto/WeiXinPayScoreServiceResourceDTO.class
+com/mofangchuxing/aska/domain/dto/OrderDto.class
 com/mofangchuxing/aska/domain/enums/ClientTypeEnum.class
 com/mofangchuxing/aska/domain/enums/RecordTypeEnum.class
 com/mofangchuxing/aska/domain/vo/AskaRetailsVo.class

domain/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,24 +1,27 @@
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/OrderDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/PayStatusEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/R.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/WeiXinPayScoreServiceResourceDTO.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/PayRequestVo.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ResultEnum.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/PayRequestDto.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaChannelsVo.java
+/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/entity/PlainCertificateItem.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/entity/SysMenuEntity.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/RecordTypeEnum.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/ResponseResult.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/DelayTypeEnum.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/WeiXinPayScoreServiceResourceDTO.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/PayStatusEnum.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/DelayObjectWrapper.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/R.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/BizException.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/WeiXinPayScoreServiceResourceDTO.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/Constant.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/AccountDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ResultEnum.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ClientTypeEnum.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/BaseDto.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/AskaRetailsVo.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/PayRequestDto.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/vo/WeiXinPlatformCredentialVO.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/RetailDto.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/utils/PageUtils.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/enums/ItemTypeEnum.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/ChannelDto.java
-/Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/entity/PlainCertificateItem.java
 /Users/syl/Desktop/work/aska/domain/src/main/java/com/mofangchuxing/aska/domain/dto/LoginDto.java

service/pom.xml

@@ -89,6 +89,11 @@
             <artifactId>okhttp</artifactId>
             <version>3.8.1</version>
         </dependency>
+        <dependency>
+            <groupId>commons-beanutils</groupId>
+            <artifactId>commons-beanutils</artifactId>
+            <version>1.9.4</version>
+        </dependency>
     </dependencies>
 
     <properties>

service/src/main/java/com/mofangchuxing/aska/service/ChannelService.java

@@ -1,8 +1,12 @@
 package com.mofangchuxing.aska.service;
 
+import com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos;
 import com.mofangchuxing.aska.dao.domain.AskaChannels;
+import com.mofangchuxing.aska.domain.dto.ChannelCouponDto;
 import com.mofangchuxing.aska.domain.dto.ChannelDto;
+import com.mofangchuxing.aska.domain.dto.ChannelNoDto;
 import com.mofangchuxing.aska.domain.utils.PageUtils;
+import com.mofangchuxing.aska.domain.vo.AskaChannelsVo;
 
 import java.util.List;
 
@@ -24,4 +28,10 @@ public interface ChannelService {
     PageUtils getAllChannels(ChannelDto channelDto);
 
     AskaChannels getChannelDetail(ChannelDto channelDto);
+
+    PageUtils getCouponsList(ChannelCouponDto channelCouponDto);
+
+    PageUtils getChannelNoList(ChannelCouponDto channelCouponDto);
+
+    void addChannelNo(ChannelNoDto channelNoDto);
 }

service/src/main/java/com/mofangchuxing/aska/service/OrderService.java

@@ -0,0 +1,13 @@
+package com.mofangchuxing.aska.service;
+
+import com.mofangchuxing.aska.domain.dto.OrderDto;
+import com.mofangchuxing.aska.domain.utils.PageUtils;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/23
+ * @Description:
+ */
+public interface OrderService {
+    PageUtils getOrderList(OrderDto orderDto);
+}

service/src/main/java/com/mofangchuxing/aska/service/RetailService.java

@@ -27,4 +27,6 @@ public interface RetailService {
     List<AskaRetailsVo> listAllRetails();
 
     AskaRetails getRetailDetail(RetailDto retailDto);
+
+    AskaRetailsVo getBalance(RetailDto retailDto);
 }

service/src/main/java/com/mofangchuxing/aska/service/UserService.java

@@ -3,6 +3,7 @@ package com.mofangchuxing.aska.service;
 import com.mofangchuxing.aska.dao.domain.AskaAccounts;
 import com.mofangchuxing.aska.domain.dto.AccountDto;
 import com.mofangchuxing.aska.domain.entity.SysMenuEntity;
+import com.mofangchuxing.aska.domain.utils.PageUtils;
 
 import java.util.List;
 
@@ -17,5 +18,7 @@ public interface UserService {
 
     List<SysMenuEntity> listUserMenu(AskaAccounts askaAccounts);
 
-    List<AskaAccounts> listUsers(AccountDto accountDto);
+    PageUtils listUsers(AccountDto accountDto);
+
+    AskaAccounts addAccount(AccountDto accountDto);
 }

service/src/main/java/com/mofangchuxing/aska/service/impl/ChannelServiceImpl.java

@@ -3,11 +3,18 @@ package com.mofangchuxing.aska.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.mofangchuxing.aska.dao.domain.AskaChannelcouponnos;
+import com.mofangchuxing.aska.dao.domain.AskaChannelnos;
 import com.mofangchuxing.aska.dao.domain.AskaChannels;
 import com.mofangchuxing.aska.dao.domain.AskaRetails;
+import com.mofangchuxing.aska.dao.mapper.AskaChannelcouponnosMapper;
+import com.mofangchuxing.aska.dao.mapper.AskaChannelnosMapper;
 import com.mofangchuxing.aska.dao.mapper.AskaChannelsMapper;
+import com.mofangchuxing.aska.domain.dto.ChannelCouponDto;
 import com.mofangchuxing.aska.domain.dto.ChannelDto;
+import com.mofangchuxing.aska.domain.dto.ChannelNoDto;
 import com.mofangchuxing.aska.domain.utils.PageUtils;
+import com.mofangchuxing.aska.domain.vo.AskaChannelsVo;
 import com.mofangchuxing.aska.service.ChannelService;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +31,10 @@ public class ChannelServiceImpl implements ChannelService {
 
     @Resource
     private AskaChannelsMapper askaChannelsMapper;
+    @Resource
+    private AskaChannelcouponnosMapper askaChannelcouponnosMapper;
+    @Resource
+    private AskaChannelnosMapper askaChannelnosMapper;
 
     public AskaChannels addChannel(ChannelDto channelDto) {
         AskaChannels askaChannels = new AskaChannels();
@@ -58,8 +69,8 @@ public class ChannelServiceImpl implements ChannelService {
 
     public PageUtils getAllChannels(ChannelDto channelDto) {
         PageHelper.startPage(channelDto.getPageNum(), channelDto.getPageSize());
-        List<AskaChannels> list = askaChannelsMapper.getAllChannels(channelDto);
-        PageInfo<AskaChannels> pageInfo = new PageInfo<>(list);
+        List<AskaChannelsVo> list = askaChannelsMapper.getAllChannels(channelDto);
+        PageInfo<AskaChannelsVo> pageInfo = new PageInfo<>(list);
         PageUtils page = new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
         return page;
     }
@@ -69,4 +80,30 @@ public class ChannelServiceImpl implements ChannelService {
         AskaChannels askaChannels = askaChannelsMapper.selectByPrimaryKey(channelDto.getChannelId().longValue());
         return askaChannels;
     }
+
+    @Override
+    public PageUtils getCouponsList(ChannelCouponDto channelCouponDto) {
+        PageHelper.startPage(channelCouponDto.getPageNum(), channelCouponDto.getPageSize());
+        List<AskaChannelcouponnos> channelcouponnosList = askaChannelcouponnosMapper.searchAll(channelCouponDto);
+        PageInfo<AskaChannelcouponnos> pageInfo = new PageInfo<>(channelcouponnosList);
+        PageUtils page = new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
+        return page;
+    }
+
+    @Override
+    public PageUtils getChannelNoList(ChannelCouponDto channelCouponDto) {
+        PageHelper.startPage(channelCouponDto.getPageNum(), channelCouponDto.getPageSize());
+        List<AskaChannelnos> channelcouponnosList = askaChannelnosMapper.searchAll(channelCouponDto);
+        PageInfo<AskaChannelnos> pageInfo = new PageInfo<>(channelcouponnosList);
+        PageUtils page = new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
+        return page;
+    }
+
+    @Override
+    public void addChannelNo(ChannelNoDto channelNoDto) {
+        AskaChannelnos askaChannelnos = new AskaChannelnos();
+        BeanUtil.copyProperties(channelNoDto, askaChannelnos);
+        askaChannelnos.setStatus("在用");
+        askaChannelnosMapper.insertSelective(askaChannelnos);
+    }
 }

service/src/main/java/com/mofangchuxing/aska/service/impl/OrderServiceImpl.java

@@ -0,0 +1,39 @@
+package com.mofangchuxing.aska.service.impl;
+
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.mofangchuxing.aska.dao.mapper.PayRequestMapper;
+import com.mofangchuxing.aska.domain.dto.OrderDto;
+import com.mofangchuxing.aska.domain.dto.RetailDto;
+import com.mofangchuxing.aska.domain.utils.PageUtils;
+import com.mofangchuxing.aska.domain.vo.AskaChannelsVo;
+import com.mofangchuxing.aska.domain.vo.PayRequestVo;
+import com.mofangchuxing.aska.service.OrderService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author: syl
+ * @Date: 2023/8/23
+ * @Description:
+ */
+@Service
+@Slf4j
+public class OrderServiceImpl implements OrderService {
+
+    @Resource
+    private PayRequestMapper payRequestMapper;
+
+    @Override
+    public PageUtils getOrderList(OrderDto orderDto) {
+        PageHelper.startPage(orderDto.getPageNum(), orderDto.getPageSize());
+        List<Map<String,Object>> list = payRequestMapper.getOrderList(orderDto);
+        PageInfo<Map<String,Object>> pageInfo = new PageInfo<>(list);
+        PageUtils page = new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
+        return page;
+    }
+}

service/src/main/java/com/mofangchuxing/aska/service/impl/PayServiceImpl.java

@@ -142,6 +142,7 @@ public class PayServiceImpl implements PayService {
         refundOrder.setRefundAmount(refundAmount);
         refundOrder.setMessage(payRequestDto.getMessage());
         refundOrder.setCreateTime(new Date());
+        refundOrder.setModifiedTime(new Date());
         refundOrderMapper.insertSelective(refundOrder);
         profitSharingService.returnOrder(payRequest.getId(), refundOrder.getId());
         PayRequest updatePayRequest = new PayRequest();

service/src/main/java/com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.java

@@ -110,7 +110,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
         PayRequest payRequest = payRequestMapper.selectByOrderSn(orderNo);
         askaSplitrecord.setPayId(payRequest.getId());
         askaSplitrecord.setPayAmount(payMoney);
-        askaSplitrecord.setSpiltOrderId(pOrderNo);
+        askaSplitrecord.setSplitOrderId(pOrderNo);
         askaSplitrecord.setRecordType(RecordTypeEnum.TYPE_PAY.getType());
         Integer maxValue = new BigDecimal(payMoney).multiply(new BigDecimal(0.3)).intValue();
         List<Map<String, Object>> receivers = new ArrayList<>();
@@ -136,10 +136,10 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
             AskaChannels askaChannels = askaChannelsMapper.selectByPrimaryKey(askaChannelcouponnos.getChannelId().longValue());
             channelReceiver = getReceiverMap(askaChannels.getAccountType(),
                     askaChannels.getAccount(),askaChannels.getTripartite(), payMoney, askaChannels.getTripvalue(), askaChannels.getAccountName(), "分账给渠道-"+askaChannels.getName());
-            receivers.add(channelReceiver);
             askaSplitrecord.setChannelName(askaChannels.getName());
             askaSplitrecord.setChannelId(askaChannels.getId());
             channelAmount = Integer.parseInt(channelReceiver.get("amount").toString());
+            askaSplitrecord.setChannelAccount(askaChannels.getAccount());
             askaSplitrecord.setChannelAmount(channelAmount.toString());
             askaSplitrecord.setChannelSplitRule("tripartite = " + askaChannels.getTripartite()+ ", tripvalue = "+askaChannels.getTripvalue());
         }
@@ -309,7 +309,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
             refundRecord.setRetailAccountAmount(Math.negateExact(refundRecord.getRetailAccountAmount()));
             refundRecord.setRetailAmount(String.valueOf(Math.negateExact(Integer.parseInt(refundRecord.getRetailAmount()))));
             //门店分账回退
-            boolean retailRefundResult = returnSplitApi(askaSplitrecord.getSpiltOrderId(), askaSplitrecord.getRetailAccount(), askaSplitrecord.getRetailRealtimeAmount());
+            boolean retailRefundResult = returnSplitApi(askaSplitrecord.getSplitOrderId(), askaSplitrecord.getRetailAccount(), askaSplitrecord.getRetailRealtimeAmount());
             if (!retailRefundResult) {
                 refundRecord.setRetailAccountAmount(refundRecord.getRetailRealtimeAmount() + refundRecord.getRetailAccountAmount());
                 refundRecord.setRetailRealtimeAmount(0);
@@ -318,7 +318,7 @@ public class ProfitSharingServiceImpl implements ProfitSharingService {
             refundRecord.setChannelAccountAmount(Math.negateExact(refundRecord.getChannelAccountAmount()));
             refundRecord.setChannelAmount(String.valueOf(Math.negateExact(Integer.parseInt(refundRecord.getChannelAmount()))));
             //渠道分账回退
-            boolean channelRefundRecord = returnSplitApi(askaSplitrecord.getSpiltOrderId(), askaSplitrecord.getChannelAccount(), askaSplitrecord.getChannelRealtimeAmount());
+            boolean channelRefundRecord = returnSplitApi(askaSplitrecord.getSplitOrderId(), askaSplitrecord.getChannelAccount(), askaSplitrecord.getChannelRealtimeAmount());
             if (!channelRefundRecord) {
                 refundRecord.setChannelAccountAmount(refundRecord.getChannelAccountAmount() + refundRecord.getChannelRealtimeAmount());
                 refundRecord.setChannelRealtimeAmount(0);

service/src/main/java/com/mofangchuxing/aska/service/impl/RetailServiceImpl.java

@@ -9,6 +9,7 @@ import com.mofangchuxing.aska.domain.dto.RetailDto;
 import com.mofangchuxing.aska.domain.utils.PageUtils;
 import com.mofangchuxing.aska.domain.vo.AskaRetailsVo;
 import com.mofangchuxing.aska.service.RetailService;
+import com.mofangchuxing.aska.service.utils.PropertyCopyUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -67,7 +68,7 @@ public class RetailServiceImpl implements RetailService {
             updateRetails.setTripvalue(Integer.parseInt(retailDto.getTripvalue()));
             updateRetails.setStatus(retailDto.getStatus());
             askaRetailsMapper.updateByPrimaryKeySelective(updateRetails);
-            BeanUtil.copyProperties(updateRetails,askaRetails);
+            PropertyCopyUtils.copyPropertiesNotNull(updateRetails,askaRetails);
         }
         return askaRetails;
     }
@@ -92,4 +93,20 @@ public class RetailServiceImpl implements RetailService {
         List<AskaRetailsVo> list = askaRetailsMapper.listAllRetailsNoLimit();
         return list;
     }
+
+    @Override
+    public AskaRetailsVo getBalance(RetailDto retailDto) {
+        AskaRetails askaRetails = askaRetailsMapper.selectByPrimaryKey(retailDto.getRetailId());
+        AskaRetailsVo askaRetailsVo = new AskaRetailsVo();
+        askaRetailsVo.setAccount(askaRetails.getAccount());
+        askaRetailsVo.setAccountName(askaRetails.getAccountName());
+        askaRetailsVo.setAccountType(askaRetails.getAccountType());
+        askaRetailsVo.setBalance(askaRetails.getBalance());
+        askaRetailsVo.setRelation(askaRetails.getRelation());
+        askaRetailsVo.setTotalCashOut(askaRetails.getTotalCashOut());
+        askaRetailsVo.setTotalIncome(askaRetails.getTotalIncome());
+        askaRetailsVo.setTotalRefund(askaRetails.getTotalRefund());
+        askaRetailsVo.setTotalSplit(askaRetails.getTotalSplit());
+        return askaRetailsVo;
+    }
 }

service/src/main/java/com/mofangchuxing/aska/service/impl/UserServiceImpl.java

@@ -1,11 +1,16 @@
 package com.mofangchuxing.aska.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.mofangchuxing.aska.dao.domain.AskaAccounts;
+import com.mofangchuxing.aska.dao.domain.AskaChannels;
 import com.mofangchuxing.aska.dao.mapper.AskaAccountsMapper;
 import com.mofangchuxing.aska.dao.mapper.SysMenuMapper;
 import com.mofangchuxing.aska.domain.Constant;
 import com.mofangchuxing.aska.domain.dto.AccountDto;
 import com.mofangchuxing.aska.domain.entity.SysMenuEntity;
+import com.mofangchuxing.aska.domain.utils.PageUtils;
 import com.mofangchuxing.aska.service.UserService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
@@ -73,7 +78,21 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public List<AskaAccounts> listUsers(AccountDto accountDto) {
-        return askaAccountsMapper.selectByRole(accountDto.getRole());
+    public PageUtils listUsers(AccountDto accountDto) {
+        PageHelper.startPage(accountDto.getPageNum(), accountDto.getPageSize());
+        List<AskaAccounts> list = askaAccountsMapper.selectByRole(accountDto.getRole());
+        PageInfo<AskaAccounts> pageInfo = new PageInfo<>(list);
+        PageUtils page = new PageUtils(pageInfo.getList(), (int) pageInfo.getTotal(), pageInfo.getPageSize(), pageInfo.getPageNum());
+        return page;
+    }
+
+    @Override
+    public AskaAccounts addAccount(AccountDto accountDto) {
+        AskaAccounts askaAccounts = new AskaAccounts();
+        BeanUtil.copyProperties(accountDto, askaAccounts);
+        askaAccounts.setRole("none");
+        askaAccounts.setStatus("start");
+        askaAccountsMapper.insertSelective(askaAccounts);
+        return askaAccounts;
     }
 }

service/src/main/java/com/mofangchuxing/aska/service/utils/PropertyCopyUtils.java

@@ -0,0 +1,28 @@
+package com.mofangchuxing.aska.service.utils;
+
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.beanutils.PropertyUtils;
+
+import java.beans.BeanInfo;
+import java.beans.Introspector;
+import java.beans.PropertyDescriptor;
+
+@Slf4j
+public class PropertyCopyUtils {
+    public static void copyPropertiesNotNull(Object source, Object dest) {
+        try {
+            PropertyDescriptor[] propertyDescriptors = PropertyUtils.getPropertyDescriptors(source);
+            // 遍历属性，并判断源对象中属性值是否为空
+            for (PropertyDescriptor descriptor : propertyDescriptors) {
+                Object propertyValue = PropertyUtils.getProperty(source, descriptor.getName());
+                if (propertyValue != null) {
+                    BeanUtils.setProperty(dest, descriptor.getName(), propertyValue);
+                }
+            }
+        } catch (Exception e) {
+            // 异常处理
+            e.printStackTrace();
+        }
+    }
+}

service/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -11,11 +11,14 @@ com/mofangchuxing/aska/service/common/PayCommonUtil.class
 com/mofangchuxing/aska/service/common/MyX509TrustManager.class
 com/mofangchuxing/aska/service/PayService.class
 com/mofangchuxing/aska/service/config/WxPayV3Config.class
+com/mofangchuxing/aska/service/impl/OrderServiceImpl.class
 com/mofangchuxing/aska/service/common/GenerateCodeUtil$Mythread.class
+com/mofangchuxing/aska/service/OrderService.class
 com/mofangchuxing/aska/service/RetailService.class
 com/mofangchuxing/aska/service/impl/ChannelServiceImpl.class
 com/mofangchuxing/aska/service/common/MD5Util.class
 com/mofangchuxing/aska/service/impl/UserServiceImpl.class
+com/mofangchuxing/aska/service/utils/PropertyCopyUtils.class
 com/mofangchuxing/aska/service/common/DelayNotifyComponent.class
 com/mofangchuxing/aska/service/ProfitSharingService.class
 com/mofangchuxing/aska/service/UserService.class

service/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,23 +1,26 @@
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/RetailService.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/XMLUtil.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/RetailServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/MD5Util.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/CouponServiceImpl.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/UserServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/OrderService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/PayCommonUtil.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ChannelService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/UserService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedisConfig.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedissonConfig.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ProfitSharingService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/OrderServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/RetailServiceImpl.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/MD5Util.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/ProfitSharingServiceImpl.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/ClientCustomSSL.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/PayCommonUtil.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/WxPayV3Config.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ChannelService.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/GenerateCodeUtil.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/PayServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/UserService.java
+/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/utils/PropertyCopyUtils.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/CouponService.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/utils/WxPayV3Utils.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/DelayNotifyComponent.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/PayService.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/common/MyX509TrustManager.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedisConfig.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/config/RedissonConfig.java
 /Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/impl/ChannelServiceImpl.java
-/Users/syl/Desktop/work/aska/service/src/main/java/com/mofangchuxing/aska/service/ProfitSharingService.java