修复

admin-pc/.env.development

@@ -1,5 +1,5 @@
 NODE_ENV=development
-VUE_APP_API_BASE_URL=http://localhost:8000/recycle-admin/
+VUE_APP_API_BASE_URL=http://localhost:8081/recycle-admin/
 VUE_APP_CAS_BASE_URL=http://cas.example.org:8443/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview
 

admin-pc/.env.production

@@ -1,4 +1,4 @@
 NODE_ENV=production
-VUE_APP_API_BASE_URL=http://localhost:8000/recycle-admin/
+VUE_APP_API_BASE_URL=http://localhost:8081/recycle-admin/
 VUE_APP_CAS_BASE_URL=http://localhost:8888/cas
 VUE_APP_ONLINE_BASE_URL=http://fileview.jeecg.com/onlinePreview

module-common/src/main/java/org/jeecg/api/bean/FansPageBean.java

@@ -0,0 +1,27 @@
+package org.jeecg.api.bean;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class FansPageBean {
+
+    //用户头像
+    private String headImage;
+
+    //用户昵称
+    private String nickName;
+
+    private String phone;
+
+    //用户下单量
+    private Integer orderNum;
+
+    //用户佣金
+    private BigDecimal commission;
+
+    //时间
+    private Date createTime;
+}

module-common/src/main/java/org/jeecg/api/bean/PageBean.java

@@ -6,6 +6,8 @@ import lombok.Data;
 @Data
 public class PageBean {
 
+    private String title;
+
     /**显示条数*/
     @ApiModelProperty(value = "显示条数" )
     private Integer pageSize;

module-common/src/main/java/org/jeecg/api/bean/WxQrCodeVo.java

@@ -0,0 +1,14 @@
+package org.jeecg.api.bean;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class WxQrCodeVo {
+    /**图片地址*/
+    @ApiModelProperty(value = "图片地址")
+    private String url;
+
+    @ApiModelProperty(value = "加油站名称")
+    private String name;
+}

module-common/src/main/java/org/jeecg/api/controller/AppletMyTeamController.java

@@ -40,7 +40,7 @@ public class AppletMyTeamController {
     //解除员工
     @ApiOperation(value="解除员工", notes="解除员工")
     @PostMapping(value = "/removeMember")
-    public Result<?> removeMember(String token,String id) {
+    public Result<?> removeMember(@RequestHeader("X-Access-Token") String token,String id) {
         return appletInfoTeamService.removeMember(token,id);
     }
 

module-common/src/main/java/org/jeecg/api/controller/AppletOrderController.java

@@ -48,9 +48,9 @@ public class AppletOrderController {
 
     //创建预约订单
     @ApiOperation(value="创建预约订单", notes="创建预约订单")
-    @GetMapping(value = "/createOrder")
-    public Result<?> createOrder() {
-        return Result.OK("接口未处理");
+    @PostMapping(value = "/createOrder")
+    public Result<?> createOrder(@RequestHeader("X-Access-Token") String token,String list,String addressId,String strTime) {
+        return appletOrderService.createOrder(token,list,addressId,strTime);
     }
 
 

module-common/src/main/java/org/jeecg/api/controller/AppletOrderTeamController.java

@@ -8,10 +8,8 @@ import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletOrderService;
 import org.jeecg.api.service.AppletOrderTeamService;
 import org.jeecg.common.api.vo.Result;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestHeader;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.modules.commonOrder.entity.CommonOrder;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 
@@ -28,39 +26,57 @@ public class AppletOrderTeamController {
     //管理员：订单列表带分页搜索
     @ApiOperation(value="管理员：订单列表带分页搜索", notes="管理员：订单列表带分页搜索")
     @GetMapping(value = "/getOrderList")
-    public Result<?> getOrderList(@RequestHeader("X-Access-Token") String token, Integer status, PageBean pageBean) {
-        return Result.OK("查询成功");
+    public Result<?> getOrderList(@RequestHeader("X-Access-Token") String token, Integer status,String userId, PageBean pageBean) {
+        return appletOrderTeamService.getOrderListPage(token, status,userId, pageBean);
     }
 
 
     //管理员：订单详情
-    @RequestMapping(value = "/getOrderDetail")
+    @ApiOperation(value="管理员：订单详情", notes="管理员：订单详情")
+    @GetMapping(value = "/getOrderDetail")
     public Result<?> getOrderDetail(@RequestHeader("X-Access-Token") String token,String orderId) {
-        return Result.OK("查询成功");
+        return appletOrderTeamService.getOrderDetail(token,orderId);
     }
 
 
     //管理员：订单通过
-    @RequestMapping(value = "/passOrder")
+    @ApiOperation(value="管理员：订单通过", notes="管理员：订单通过")
+    @PostMapping(value = "/passOrder")
     public Result<?> passOrder(@RequestHeader("X-Access-Token") String token,String orderId) {
-        return Result.OK("查询成功");
+        return appletOrderTeamService.passOrder(token,orderId);
     }
 
 
     //管理员：订单驳回
-    @RequestMapping(value = "/rejectOrder")
+    @ApiOperation(value="管理员：订单驳回", notes="管理员：订单驳回")
+    @PostMapping(value = "/rejectOrder")
     public Result<?> rejectOrder(@RequestHeader("X-Access-Token") String token,String orderId) {
-        return Result.OK("查询成功");
+        return appletOrderTeamService.rejectOrder(token,orderId);
     }
 
 
     //管理员：质检信息提交
-    @RequestMapping(value = "/submitQualityInfo")
+    @ApiOperation(value="管理员：质检信息提交", notes="管理员：质检信息提交")
+    @PostMapping(value = "/submitQualityInfo")
     public Result<?> submitQualityInfo() {
-        return Result.OK("订单未处理");
+        return appletOrderTeamService.submitQualityInfo();
     }
 
 
+    //管理员：该用户的总回收统计
+    @ApiOperation(value="管理员：该用户的总回收统计", notes="管理员：该用户的总回收统计")
+    @GetMapping(value = "/getUserOrderNum")
+    public Result<?> getUserOrderNum(String userId) {
+        return appletOrderTeamService.getUserOrderNum(userId);
+    }
+
+    //管理员：修改子订单信息-价格
+
+    @ApiOperation(value="管理员：修改子订单信息", notes="管理员：修改子订单信息")
+    @GetMapping(value = "/updateOrder")
+    public Result<?> updateOrderPrice(@RequestHeader("X-Access-Token")String token, CommonOrder commonOrder) {
+        return appletOrderTeamService.updateOrderPrice(token,commonOrder);
+    }
 
 
 }

module-common/src/main/java/org/jeecg/api/controller/AppletPromotionController.java

@@ -2,10 +2,17 @@ package org.jeecg.api.controller;
 
 
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.jeecg.api.bean.PageBean;
+import org.jeecg.api.service.AppletOrderTeamService;
+import org.jeecg.api.service.AppletPromotionService;
 import org.jeecg.common.api.vo.Result;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.jeecg.modules.commonPromotion.entity.CommonPromotion;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
 
 @Api(tags="我的-推广相关接口")
 @RestController
@@ -14,26 +21,101 @@ import org.springframework.web.bind.annotation.RestController;
 public class AppletPromotionController {
 
 
+    @Resource
+    private AppletPromotionService appletPromotionService;
+
+
     //获取推广排行版带分页
-    @RequestMapping(value = "/getRankList")
-    public Result<?> getRankList(){
-        return Result.OK("推广排行版");
+    @ApiOperation(value="获取推广排行版带分页", notes="获取推广排行版带分页")
+    @GetMapping(value = "/getRankList")
+    public Result<?> getRankList(PageBean pageBean){
+        return appletPromotionService.getRankList(pageBean);
+    }
+
+    //我的推广官申请表单信息
+    @ApiOperation(value="我的推广官申请表单信息", notes="我的推广官申请表单信息")
+    @GetMapping(value = "/getMyPromotionInfo")
+    public Result<?> getMyPromotionInfo(@RequestHeader("X-Access-Token") String token){
+        return appletPromotionService.getMyPromotionInfo(token);
     }
 
 
     //提交申请成为推广官
-    @RequestMapping(value = "/apply")
-    public Result<?> apply(){
-        return Result.OK("提交申请成为推广官");
+    @ApiOperation(value="提交申请成为推广官", notes="提交申请成为推广官")
+    @PostMapping(value = "/apply")
+    public Result<?> apply(@RequestHeader("X-Access-Token") String token, CommonPromotion commonPromotion){
+        return appletPromotionService.apply(token,commonPromotion);
     }
 
 
+    //获取个人邀请码
+    @ApiOperation(value="获取个人邀请码", notes="获取个人邀请码")
+    @GetMapping(value = "/getInviteCode", produces = MediaType.IMAGE_PNG_VALUE)
+    public byte[] getInviteCode(@RequestHeader("X-Access-Token") String token){
+        return appletPromotionService.getInviteCode2(token);
+    }
+
+
+
+
     //升级推广官
-    @RequestMapping(value = "/upgrade")
-    public Result<?> upgrade(){
+    @ApiOperation(value="升级推广官", notes="升级推广官")
+    @PostMapping(value = "/upgrade")
+    public Result<?> upgrade(@RequestHeader("X-Access-Token") String token){
         return Result.OK("升级推广官");
     }
 
 
+    //获取我的直接推荐间接推荐用户列表带分页
+    @ApiOperation(value="获取我的直接推荐间接推荐用户列表带分页", notes="获取我的直接推荐间接推荐用户列表带分页")
+    @GetMapping(value = "/getHanHaiMemberUser")
+    public Result<?> getHanHaiMemberUser(@RequestHeader("X-Access-Token") String token,Integer state,PageBean pageBean){
+        return appletPromotionService.getHanHaiMemberUser(token,state,pageBean);
+    }
+
+
+
+
+
+    //管理员：获取推广表单申请列表带分页
+    @ApiOperation(value="管理员：获取推广表单申请列表带分页", notes="管理员：获取推广表单申请列表带分页")
+    @GetMapping(value = "/getPromotionApplyListPage")
+    public Result<?> getPromotionApplyListPage(PageBean pageBean){
+        return appletPromotionService.getPromotionApplyListPage(pageBean);
+    }
+
+
+    //管理员：通过推广表单申请
+    @ApiOperation(value="管理员：通过推广表单申请", notes="管理员：通过推广表单申请")
+    @PostMapping(value = "/passPromotionApply")
+    public Result<?> passPromotionApply(@RequestHeader("X-Access-Token") String token,String id){
+        return appletPromotionService.passPromotionApply(token,id);
+    }
+
+    //管理员：拒绝推广表单申请
+    @ApiOperation(value="管理员：拒绝推广表单申请", notes="管理员：拒绝推广表单申请")
+    @PostMapping(value = "/rejectPromotionApply")
+    public Result<?> rejectPromotionApply(@RequestHeader("X-Access-Token") String token,String id){
+        return appletPromotionService.rejectPromotionApply(token,id);
+    }
+
+
+    //管理员:推广员信息列表
+    @ApiOperation(value="管理员:推广员信息列表", notes="管理员:推广员信息列表")
+    @GetMapping(value = "/getPromotionList")
+    public Result<?> getPromotionList(PageBean pageBean){
+        return appletPromotionService.getPromotionList(pageBean);
+    }
+
+
+
+
+
+
+
+
+
+
+
 
 }

module-common/src/main/java/org/jeecg/api/service/AppletOrderService.java

@@ -18,5 +18,7 @@ public interface AppletOrderService {
     Result<?> cancelOrder(String token, String orderId);
 
 
+    //创建预约订单
+    Result<?> createOrder(String token, String list, String addressId, String strTime);
 
 }

module-common/src/main/java/org/jeecg/api/service/AppletOrderTeamService.java

@@ -2,11 +2,12 @@ package org.jeecg.api.service;
 
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.commonOrder.entity.CommonOrder;
 
 public interface AppletOrderTeamService {
 
     //管理员：订单列表带分页搜索
-    Result<?> getOrderListPage(String token, Integer status, PageBean pageBean);
+    Result<?> getOrderListPage(String token, Integer status,String c, PageBean pageBean);
 
     //管理员：订单详情
     Result<?> getOrderDetail(String token,String orderId);
@@ -19,4 +20,12 @@ public interface AppletOrderTeamService {
 
     //管理员：提交质量信息
     Result<?> submitQualityInfo();
+
+
+    //管理员：该用户的总回收统计
+    Result<?> getUserOrderNum(String userId);
+
+
+    //管理员：修改子订单信息-价格
+    Result<?> updateOrderPrice(String token, CommonOrder order);
 }

module-common/src/main/java/org/jeecg/api/service/AppletPromotionService.java

@@ -0,0 +1,38 @@
+package org.jeecg.api.service;
+
+import org.jeecg.api.bean.PageBean;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.commonPromotion.entity.CommonPromotion;
+
+public interface AppletPromotionService {
+
+
+    //获取推广排行榜单带分页
+    Result<?> getRankList(PageBean pageBean);
+
+    //我的推广官申请表单信息
+    Result<?> getMyPromotionInfo(String token);
+
+    //提交申请成为推广官
+    Result<?> apply(String token, CommonPromotion commonPromotion);
+
+    //获取个人邀请码
+    byte[] getInviteCode2(String token);
+
+    //获取我的直接推荐间接推荐用户列表带分页
+    Result<?> getHanHaiMemberUser(String token,Integer state,PageBean pageBean);
+
+
+    //管理员：获取推广表单申请列表带分页
+    Result<?> getPromotionApplyListPage(PageBean pageBean);
+
+    //管理员：通过推广表单申请
+    Result<?> passPromotionApply(String token, String id);
+
+
+    //管理员：拒绝推广表单申请
+    Result<?> rejectPromotionApply(String token, String id);
+
+    //管理员:推广员信息列表
+    Result<?> getPromotionList(PageBean pageBean);
+}

module-common/src/main/java/org/jeecg/api/service/AppletTeamMemberService.java

@@ -0,0 +1,6 @@
+package org.jeecg.api.service;
+
+public interface AppletTeamMemberService {
+
+    //
+}

module-common/src/main/java/org/jeecg/api/service/impl/AppletAddressServiceImpl.java

@@ -62,21 +62,21 @@ public class AppletAddressServiceImpl implements AppletAddressService {
         //查到当前用户是否有默认地址给他修改成否
         List<CommonAddress> commonAddressList = commonAddressService.lambdaQuery()
                 .eq(CommonAddress::getUserId, hanHaiMember.getId())
-                .eq(CommonAddress::getDefaultFlag, "1")
+                .eq(CommonAddress::getDefaultFlag, "Y")
                 .list();
         if(commonAddressList.size() > 0){
             for (CommonAddress commonAddress : commonAddressList) {
-                commonAddress.setDefaultFlag("0");
+                commonAddress.setDefaultFlag("N");
                 commonAddressService.updateById(commonAddress);
             }
         }
         //查询当前地址是否是默认地址
         CommonAddress commonAddress = commonAddressService.getById(id);
-        if(commonAddress.getDefaultFlag().equals("0")){
-            commonAddress.setDefaultFlag("1");
+        if(commonAddress.getDefaultFlag().equals("N")){
+            commonAddress.setDefaultFlag("Y");
             commonAddressService.updateById(commonAddress);
-        }else if(commonAddress.getDefaultFlag().equals("1")){
-            commonAddress.setDefaultFlag("0");
+        }else if(commonAddress.getDefaultFlag().equals("Y")){
+            commonAddress.setDefaultFlag("N");
             commonAddressService.updateById(commonAddress);
         }
         return Result.OK("修改成功");

module-common/src/main/java/org/jeecg/api/service/impl/AppletInfoTeamServiceImpl.java

@@ -128,6 +128,6 @@ public class AppletInfoTeamServiceImpl implements AppletInfoTeamService {
         HanHaiMember memberInfo = hanHaiMemberService.getById(id);
         memberInfo.setRole(0);
         hanHaiMemberService.updateById(memberInfo);
-        return Result.OK("拉黑成功");
+        return Result.OK("解除成功");
     }
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletLoginServiceImpl.java

@@ -15,6 +15,8 @@ import org.jeecg.common.util.RedisUtil;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.commonConfig.entity.CommonConfig;
 import org.jeecg.modules.commonConfig.service.ICommonConfigService;
+import org.jeecg.modules.commonMoneyLog.entity.CommonMoneyLog;
+import org.jeecg.modules.commonMoneyLog.service.ICommonMoneyLogService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,6 +27,7 @@ import javax.annotation.Resource;
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.InputStreamReader;
+import java.math.BigDecimal;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
@@ -55,7 +58,8 @@ public class AppletLoginServiceImpl implements AppletLoginService {
     //配置信息
     @Resource
     private ICommonConfigService commonConfigService;
-
+    @Resource
+    private ICommonMoneyLogService commonMoneyLogService;
 
 
 
@@ -198,8 +202,20 @@ public class AppletLoginServiceImpl implements AppletLoginService {
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         //根据用户标识查询用户信息
         hanHaiMember = memberService.getById(hanHaiMember.getId());
-        return Result.OK("个人信息查询成功",hanHaiMember);
-
+        //查询我的所有的提现记录
+        List<CommonMoneyLog> commonMoneyLogs = commonMoneyLogService.lambdaQuery()
+                .eq(CommonMoneyLog::getTitle,"用户提现")
+                .eq(CommonMoneyLog::getUserId,hanHaiMember.getId()).list();
+        //如果数据不为空
+        if (commonMoneyLogs.size()>0){
+            //计算提现总金额
+            BigDecimal totalMoney = commonMoneyLogs.stream().map(CommonMoneyLog::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
+            hanHaiMember.setIntegerPrice(totalMoney);
+            return Result.OK("个人信息查询成功",hanHaiMember);
+        }else{
+            hanHaiMember.setIntegerPrice(BigDecimal.ZERO);
+            return Result.OK("个人信息查询成功",hanHaiMember);
+        }
     }
 
     //修改用户信息

module-common/src/main/java/org/jeecg/api/service/impl/AppletMoneyLogServiceImpl.java

@@ -2,6 +2,7 @@ package org.jeecg.api.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletMoneyLogService;
 import org.jeecg.common.api.vo.Result;
@@ -32,6 +33,7 @@ public class AppletMoneyLogServiceImpl implements AppletMoneyLogService {
         IPage<CommonMoneyLog> pageList = commonMoneyLogService
                 .lambdaQuery()
                 .eq(CommonMoneyLog::getUserId,hanHaiMember.getId())
+                .eq(StringUtils.isNotBlank(pageBean.getTitle()),CommonMoneyLog::getTitle,pageBean.getTitle())
                 .eq(status!=null,CommonMoneyLog::getState,status)
                 .orderByDesc(CommonMoneyLog::getCreateTime)
                 .page(page);

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderServiceImpl.java

@@ -1,11 +1,16 @@
 package org.jeecg.api.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletOrderService;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.commonAddress.entity.CommonAddress;
+import org.jeecg.modules.commonAddress.service.ICommonAddressService;
 import org.jeecg.modules.commonBookNovel.service.ICommonBookNovelService;
 import org.jeecg.modules.commonGift.entity.CommonGift;
 import org.jeecg.modules.commonGift.service.ICommonGiftService;
@@ -16,6 +21,7 @@ import org.jeecg.modules.commonMyGift.entity.CommonMyGift;
 import org.jeecg.modules.commonMyGift.service.ICommonMyGiftService;
 import org.jeecg.modules.commonOrder.entity.CommonOrder;
 import org.jeecg.modules.commonOrder.service.ICommonOrderService;
+import org.jeecg.modules.commonShop.entity.CommonShop;
 import org.jeecg.modules.commonShop.service.ICommonShopService;
 import org.jeecg.modules.commonText.entity.CommonText;
 import org.jeecg.modules.commonText.service.ICommonTextService;
@@ -24,6 +30,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class AppletOrderServiceImpl implements AppletOrderService {
@@ -39,6 +48,8 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     private ICommonMoneyLogService commonMoneyLogService;
     @Autowired
     private ICommonTextService commonTextService;
+    @Autowired
+    private ICommonAddressService commonAddressService;
 
     // 联系客服问题相关列表数据带分页
     @Override
@@ -56,7 +67,21 @@ public class AppletOrderServiceImpl implements AppletOrderService {
         IPage<CommonOrder> pageList = commonOrderService.lambdaQuery()
                 .eq(CommonOrder::getUserId,hanHaiMember.getId())
                 .eq(status != null,CommonOrder::getStatus,status)
+                .eq(CommonOrder::getPid,"0")
                 .page(page);
+
+        //得到集合数据
+        for (CommonOrder commonOrder : pageList.getRecords()) {
+            //查询下级
+            List<CommonOrder> children = commonOrderService
+                    .lambdaQuery()
+                    .eq(CommonOrder::getPid,commonOrder.getId())
+                    .list();
+            commonOrder.setCommonOrderList(children);
+        }
+
+
+
         return Result.OK("订单列表",pageList);
     }
 
@@ -67,6 +92,13 @@ public class AppletOrderServiceImpl implements AppletOrderService {
         CommonOrder commonOrder = commonOrderService.lambdaQuery()
                 .eq(CommonOrder::getId,orderId)
                 .one();
+
+        List<CommonOrder> children = commonOrderService
+                .lambdaQuery()
+                .eq(CommonOrder::getPid,commonOrder.getId())
+                .list();
+        commonOrder.setCommonOrderList(children);
+
         return Result.OK("订单详情",commonOrder);
     }
 
@@ -87,4 +119,115 @@ public class AppletOrderServiceImpl implements AppletOrderService {
     }
 
 
+    //创建预约订单//把list转为对象 list = [{"shopId":"1","num":1},{"shopId":"2","num":2}]
+    @Override
+    public Result<?> createOrder(String token, String list, String addressId, String strTime) {
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //用户地址不能为空
+        if(StringUtils.isBlank(addressId)){
+            return Result.error("请选择收货地址");
+        }
+        //查询地址是否存在
+        CommonAddress commonAddress = commonAddressService.getById(addressId);
+        if (commonAddress==null){
+            return Result.error("地址不存在");
+        }
+        //把list转为对象 list = [{"shopId":"1","num":1},{"shopId":"2","num":2}]
+        List<CommonOrder> list1 = JSON.parseArray(list, CommonOrder.class);
+        //创建订单标识
+        String orderId = IdWorker.getIdStr();
+        if(null!=list1 && list1.size()>0) {
+            //订单总额
+            BigDecimal totalPrice = new BigDecimal(0);
+            //总直推金额
+            BigDecimal totalOneMoney = new BigDecimal(0);
+            //总二级代理金额
+            BigDecimal totalTwoMoney = new BigDecimal(0);
+            //订单商品数量
+            Integer totalNum = 0;
+
+            //创建订单详情
+            for (CommonOrder sku : list1) {
+                //查询商品信息
+                CommonShop commonShop = commonShopService.getById(sku.getShopId());
+                //商品不能为空
+                if (commonShop == null) {
+                    return Result.error("商品不存在");
+                }
+                //创建订单
+                BigDecimal price = commonShop.getPrice().multiply(new BigDecimal(sku.getNum()));
+
+//                //创建直推佣金
+//                BigDecimal oneMoney = commonShop.getOneMoney().multiply(new BigDecimal(sku.getNum()));
+//
+//                BigDecimal twoMoney = commonShop.getTwoMoney().multiply(new BigDecimal(sku.getNum()));
+
+
+                sku.setPid(orderId);
+
+                sku.setHasChild("0");
+                sku.setShopId(commonShop.getId());
+                sku.setTitle(commonShop.getName());
+                sku.setImage(commonShop.getImage());
+                sku.setPrice(price);
+                sku.setNum(sku.getNum());
+                sku.setCreateTime(new Date());
+                sku.setPrice(price);
+//                sku.setOneMoney(oneMoney);
+//                sku.setTwoMoney(twoMoney);
+
+                sku.setImage(commonShop.getImage());
+                sku.setCreateTime(new Date());
+
+                commonOrderService.save(sku);
+
+                //计算总价格
+                totalPrice = totalPrice.add(price);
+
+                totalNum = totalNum + sku.getNum();
+
+//                totalOneMoney = totalOneMoney.add(oneMoney);
+//
+//                totalTwoMoney = totalTwoMoney.add(twoMoney);
+
+            }
+
+
+            //创建主订单
+            CommonOrder cityOrder = new CommonOrder();
+            cityOrder.setId(orderId);
+            cityOrder.setUserId(hanHaiMember.getId());
+            cityOrder.setShopId(null);
+            cityOrder.setNum(totalNum);
+            cityOrder.setAddress(commonAddress.getAddress());
+            cityOrder.setName(commonAddress.getName());
+            cityOrder.setPhone(commonAddress.getPhone());
+            cityOrder.setAddressDetail(commonAddress.getAddressDetails());
+//            cityOrder.seta(addressId);
+            cityOrder.setName(commonAddress.getName());
+            cityOrder.setTitle("组合订单");
+            cityOrder.setPrice(totalPrice);
+            cityOrder.setOneMoney(totalOneMoney);
+            cityOrder.setTwoMoney(totalTwoMoney);
+            cityOrder.setPid("0");
+            cityOrder.setHasChild("1");
+
+//            cityOrder.setShopState(2);
+
+            cityOrder.setImage(null);
+//            cityOrder.setStatus("0");
+            cityOrder.setStatus(0);
+            cityOrder.setGoTime(strTime);
+            cityOrder.setAddressId(addressId);
+            cityOrder.setTestingStatus(0);
+            cityOrder.setCreateTime(new Date());
+
+            commonOrderService.save(cityOrder);
+            return Result.OK("创建预约订单成功",cityOrder);
+
+        }
+
+        return Result.OK("创建预约订单成功");
+    }
+
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletOrderTeamServiceImpl.java

@@ -12,16 +12,22 @@ import org.jeecg.modules.commonOrder.service.ICommonOrderService;
 import org.jeecg.modules.commonShop.service.ICommonShopService;
 import org.jeecg.modules.commonText.service.ICommonTextService;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Service
 public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
     //权限
     @Resource
     private ShiroRealm shiroRealm;
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
     @Autowired
     private ICommonOrderService commonOrderService;
     @Autowired
@@ -29,14 +35,29 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
 
     //管理员：订单列表带分页搜索
     @Override
-    public Result<?> getOrderListPage(String token, Integer status, PageBean pageBean){
+    public Result<?> getOrderListPage(String token, Integer status,String userId, PageBean pageBean){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         Page<CommonOrder> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
         IPage<CommonOrder> pageList = commonOrderService
                 .lambdaQuery()
                 //订单状态不为空则搜索
                 .eq(status != null,CommonOrder::getStatus,status)
+                .eq(userId != null,CommonOrder::getUserId,userId)
+                .eq(CommonOrder::getPid,"0")
                 .page(page);
+        //得到集合数据
+        for (CommonOrder commonOrder : pageList.getRecords()) {
+            //查询下级
+            List<CommonOrder> children = commonOrderService
+                    .lambdaQuery()
+                    .eq(CommonOrder::getPid,commonOrder.getId())
+                    .list();
+            commonOrder.setCommonOrderList(children);
+        }
+
+
+
+
         return Result.OK("订单列表",pageList);
     }
 
@@ -44,6 +65,13 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
     public Result<?> getOrderDetail(String token, String orderId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         CommonOrder commonOrder = commonOrderService.getById(orderId);
+
+        List<CommonOrder> children = commonOrderService
+                .lambdaQuery()
+                .eq(CommonOrder::getPid,commonOrder.getId())
+                .list();
+        commonOrder.setCommonOrderList(children);
+
         return Result.OK("订单详情",commonOrder);
     }
 
@@ -69,4 +97,30 @@ public class AppletOrderTeamServiceImpl implements AppletOrderTeamService {
     public Result<?> submitQualityInfo(){
         return Result.OK("提交成功");
     }
+
+
+    //管理员：该用户的总回收统计
+    @Override
+    public Result<?> getUserOrderNum(String userId){
+        Map<String,Object> map = new HashMap<>();
+        //查询用户信息
+        HanHaiMember hanHaiMember = hanHaiMemberService.getById(userId);
+        map.put("sum",100);
+        map.put("unit_num",200);
+        map.put("order_money",10000);
+        return Result.OK("该用户的总回收统计",map);
+    }
+
+
+    //管理员：修改子订单信息-价格
+    @Override
+    public Result<?> updateOrderPrice(String token, CommonOrder order){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        //订单标识不能为空
+        if(order.getId() == null){
+            return Result.OK("订单标识不为空");
+        }
+        commonOrderService.updateById(order);
+        return Result.OK("修改成功");
+    }
 }

module-common/src/main/java/org/jeecg/api/service/impl/AppletPromotionServiceImpl.java

@@ -0,0 +1,350 @@
+package org.jeecg.api.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import org.apache.commons.lang3.StringUtils;
+import org.jeecg.api.bean.FansPageBean;
+import org.jeecg.api.bean.PageBean;
+import org.jeecg.api.bean.WxQrCodeVo;
+import org.jeecg.api.service.AppletPromotionService;
+import org.jeecg.api.wxUtils.HttpClientUtil;
+import org.jeecg.common.api.vo.Result;
+import org.jeecg.config.shiro.ShiroRealm;
+import org.jeecg.modules.commonConfig.entity.CommonConfig;
+import org.jeecg.modules.commonConfig.service.ICommonConfigService;
+import org.jeecg.modules.commonOrder.entity.CommonOrder;
+import org.jeecg.modules.commonOrder.service.ICommonOrderService;
+import org.jeecg.modules.commonPromotion.entity.CommonPromotion;
+import org.jeecg.modules.commonPromotion.service.ICommonPromotionService;
+import org.jeecg.modules.commonText.entity.CommonText;
+import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
+import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.springframework.http.HttpMethod;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
+import org.springframework.util.LinkedMultiValueMap;
+import org.springframework.util.MultiValueMap;
+import org.springframework.web.client.RestTemplate;
+
+import javax.annotation.Resource;
+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.math.BigDecimal;
+import java.net.URL;
+import java.nio.file.Files;
+import java.util.*;
+import java.util.List;
+
+@Service
+public class AppletPromotionServiceImpl implements AppletPromotionService {
+
+    //权限
+    @Resource
+    private ShiroRealm shiroRealm;
+    @Resource
+    private IHanHaiMemberService hanHaiMemberService;
+    @Resource
+    private ICommonPromotionService commonPromotionService;
+    @Resource
+    private ICommonConfigService commonConfigService;
+    @Resource
+    private ICommonOrderService commonOrderService;
+
+    //获取推广排行榜单带分页
+    @Override
+    public Result<?> getRankList(PageBean pageBean){
+        IPage<HanHaiMember> page = new Page<>(pageBean.getPageNo(), pageBean.getPageSize());
+        IPage<HanHaiMember> pageList = hanHaiMemberService
+                .lambdaQuery()
+                .page(page);
+        return Result.OK("推广排行榜单",pageList);
+    }
+
+    //我的推广官申请表单信息
+    @Override
+    public Result<?> getMyPromotionInfo(String token){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CommonPromotion one = commonPromotionService.lambdaQuery()
+                .eq(CommonPromotion::getUserId, member.getId())
+                .one();
+        return Result.OK("我的推广官申请表单信息",one);
+    }
+
+    //提交申请成为推广官
+    @Override
+    public Result<?> apply(String token, CommonPromotion commonPromotion){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CommonPromotion one = commonPromotionService.lambdaQuery()
+                .eq(CommonPromotion::getUserId, member.getId())
+                .one();
+        if(one != null){
+            return Result.error("您已提交过申请");
+        }
+        commonPromotion.setStatus(0);
+        commonPromotion.setCreateTime(new Date());
+        commonPromotion.setUserId(member.getId());
+        commonPromotionService.save(commonPromotion);
+        return Result.OK("提交成功");
+    }
+
+    //获取推广二维码 2
+    @Override
+    public byte[] getInviteCode2(String token){
+        HanHaiMember member = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        // 获取环境配置
+        CommonConfig vsion = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "v_sion")
+                .one();
+        Integer vsionStr = Integer.parseInt(vsion.getKeyContent());
+        String trial = "release";
+        if(vsionStr == 0){
+            trial= "release";
+        }else if(vsionStr == 1){
+            trial= "trial";
+        }else{
+            trial= "develop";
+        }
+
+        // 获取必要的配置信息
+        CommonConfig xcxSharePage = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "xcxSharePage")
+                .one();
+
+        CommonConfig oneImage = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "codeImg")
+                .one();
+
+        CommonConfig qr_code = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "qr_code")
+                .one();
+
+        CommonConfig image_go_url = commonConfigService.lambdaQuery()
+                .eq(CommonConfig::getKeyName, "image_go_url")
+                .one();
+
+        String backgroundImageUrl = qr_code.getKeyContent();
+
+        // 尝试从缓存获取二维码
+        String cacheKey = "CodeImage::" + trial + member.getId();
+        WxQrCodeVo wxCodeVo = new WxQrCodeVo();
+
+        wxCodeVo.setName("爱回收欢迎您");
+
+        // 如果启用了Redis缓存，可以取消下面注释
+//         String cachedQrCode = (String) redisUtil.get(cacheKey);
+//         if(cachedQrCode != null){
+//             String combinedImageUrl = this.generateAndCombineImagesFromUrl(cachedQrCode, backgroundImageUrl, "combined_image_code");
+//             wxCodeVo.setUrl(combinedImageUrl);
+//             return Result.OK(wxCodeVo);
+//         }
+
+        try {
+
+            // 准备微信API请求参数
+            String key = "shareId=" + member.getId();
+            Map<String, Object> param = new HashMap<>();
+            param.put("path", xcxSharePage.getKeyContent() + "?" + key);
+            param.put("scene", member.getId());
+            param.put("width", 150);
+            param.put("auto_color", false);
+            param.put("env_version", trial);
+
+//            Map<String, Object> line_color = new HashMap<>();
+//            line_color.put("r", 0);
+//            line_color.put("g", 0);
+//            line_color.put("b", 0);
+//            param.put("line_color", line_color);
+
+
+            param.put("is_hyaline", true);
+
+            // 获取微信小程序码
+            String accessToken = this.getAccessToken();
+            String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken;
+
+            // 请求微信API获取二维码图片数据
+            RestTemplate rest = new RestTemplate();
+            MultiValueMap<String, String> headers = new LinkedMultiValueMap<>();
+            org.springframework.http.HttpEntity requestEntity = new org.springframework.http.HttpEntity(JSON.toJSONString(param), headers);
+            ResponseEntity<byte[]> entity = rest.exchange(url, HttpMethod.POST, requestEntity, byte[].class, new Object[0]);
+            byte[] qrCodeBytes = entity.getBody();
+
+            // 直接将二维码图片转为MultipartFile，避免写入临时文件
+//            MultipartFile qrCodeFile = createMultipartFile(qrCodeBytes, "qrcode.jpg");
+
+            // 上传二维码到阿里云并获取URL
+//            String qrCodeImageUrl = image_go_url.getKeyContent() + this.uploadAliYunOss(qrCodeFile);
+
+            // 合并图片并上传
+//            String combinedImageUrl = this.generateAndCombineImagesFromUrl2(qrCodeBytes, backgroundImageUrl);
+
+            // 设置返回数据
+
+            // 如果启用了Redis缓存，可以取消下面注释
+            //redisUtil.set(cacheKey, qrCodeImageUrl, 3600); // 缓存一小时
+
+            return this.generateAndCombineImagesFromUrl2(qrCodeBytes, backgroundImageUrl);
+        } catch (Exception e) {
+            e.printStackTrace();
+
+            return null;
+        }
+    }
+
+    public byte[] generateAndCombineImagesFromUrl2(byte[] qrCodeImageByte, String backgroundUrl) {
+        File file = null;
+        try {
+            // 从字节数组加载小程序码图像
+            BufferedImage qrCodeImage = ImageIO.read(new ByteArrayInputStream(qrCodeImageByte));
+
+            // 从URL加载背景图像
+            URL backgroundImageUrl = new URL(backgroundUrl);
+            BufferedImage backgroundImage = ImageIO.read(backgroundImageUrl);
+
+            // 创建一个新的BufferedImage来保存合并后的图像
+            Graphics2D g2d = backgroundImage.createGraphics();
+
+            int wh = backgroundImage.getWidth() / 3;
+
+            // 计算小程序码放置的位置（这里以中心位置为例）
+            int qrCodeX = (backgroundImage.getWidth() - wh) / 2;
+            int qrCodeY = (int) ((backgroundImage.getHeight() - wh) * 0.6);
+
+            // 绘制小程序码图像
+            g2d.drawImage(qrCodeImage, qrCodeX, qrCodeY, wh, wh, null);
+
+            // 释放Graphics2D资源
+            g2d.dispose();
+
+            // 将合并后的图像保存到临时文件
+            file = File.createTempFile("combined_", ".png");
+            ImageIO.write(backgroundImage, "png", file);
+
+            // 上传到阿里云OSS
+//            return this.uploadAliYunOss(Files.readAllBytes(file.toPath()), file.getName());
+            return Files.readAllBytes(file.toPath());
+        } catch (Exception e) {
+
+            throw new RuntimeException("生成合并图片失败", e);
+        } finally {
+            // 删除临时文件
+            if (file != null && file.exists()) {
+                file.delete();
+            }
+        }
+    }
+
+    private String appid = "wx2bd656ae9704dbee";
+
+    private String secret = "b07f82b16e9598bc23de604f49c57e23";
+    /**
+     * 获取令牌
+     *
+     * @return
+     */
+    private String getAccessToken() {
+        String requestUrl = "https://api.weixin.qq.com/cgi-bin/token?grant_type=client_credential&appid=" + appid + "&secret=" + secret;
+        String doGet2 = HttpClientUtil.doGet2(requestUrl);
+        Map<String, String> map = JSON.parseObject(doGet2, new TypeReference<Map<String, String>>() {
+        });
+        return map.get("access_token");
+    }
+
+    @Override
+    public Result<?> getHanHaiMemberUser(String token,Integer state,PageBean pageBean){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        Page<HanHaiMember> page = new Page<HanHaiMember>(pageBean.getPageNo(), pageBean.getPageSize());
+        Page<HanHaiMember> pageList = hanHaiMemberService.lambdaQuery()
+                .eq(HanHaiMember::getShareId,hanHaiMember.getId())
+                .page(page);
+        if(state == 0){
+            pageList = hanHaiMemberService.lambdaQuery()
+                    .eq(HanHaiMember::getShareId,hanHaiMember.getId())
+                    .page(page);
+        }else{
+            pageList = hanHaiMemberService.lambdaQuery()
+                    .eq(HanHaiMember::getVid,hanHaiMember.getId())
+                    .page(page);
+        }
+
+
+
+        //创建一个新的集合
+        Page<FansPageBean> pageListFans = new Page<>();
+        List<FansPageBean> fansPageBean = new ArrayList<>();
+        pageList.getRecords().forEach(item->{
+            //创建一个新的对象
+            FansPageBean fansPageBean1 = new FansPageBean();
+            fansPageBean1.setPhone(item.getPhone());
+            fansPageBean1.setHeadImage(item.getHeadImage());
+            fansPageBean1.setNickName(item.getNickName());
+            //查询该用户的订单数量,count中的state>0
+
+            int count = commonOrderService.lambdaQuery()
+                    .in(CommonOrder::getState,1,2,3)
+                    .eq(CommonOrder::getUserId,item.getId())
+                    .count().intValue();
+            fansPageBean1.setOrderNum(count);
+
+            //查询该用户的佣金之和
+            BigDecimal commission = new BigDecimal(0);
+
+            fansPageBean1.setCommission(commission);
+            fansPageBean1.setCreateTime(item.getCreateTime());
+            fansPageBean.add(fansPageBean1);
+        });
+        pageListFans.setRecords(fansPageBean);
+
+        return Result.OK(pageListFans);
+    }
+
+
+    //管理员：获取推广表单申请列表带分页
+    @Override
+    public Result<?> getPromotionApplyListPage(PageBean pageBean){
+        Page<CommonPromotion> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
+        Page<CommonPromotion> pageList = commonPromotionService.lambdaQuery()
+                .page(page);
+        return Result.OK("推广表单申请列表",pageList);
+    }
+
+
+    //管理员：通过推广表单申请
+    @Override
+    public Result<?> passPromotionApply(String token, String id){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CommonPromotion commonPromotion = commonPromotionService.getById(id);
+        commonPromotion.setStatus(1);
+        commonPromotionService.updateById(commonPromotion);
+        return Result.OK("通过推广表单申请成功");
+    }
+
+
+    //管理员：拒绝推广表单申请
+    @Override
+    public Result<?> rejectPromotionApply(String token, String id){
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+        CommonPromotion commonPromotion = commonPromotionService.getById(id);
+        commonPromotion.setStatus(2);
+        commonPromotionService.updateById(commonPromotion);
+        return Result.OK("拒绝推广表单申请成功");
+    }
+
+
+
+    //管理员:推广员信息列表
+    @Override
+    public Result<?> getPromotionList(PageBean pageBean){
+        Page<HanHaiMember> page = new Page<>(pageBean.getPageNo(),pageBean.getPageSize());
+        Page<HanHaiMember> pageList = hanHaiMemberService.lambdaQuery()
+                .eq(HanHaiMember::getIsUser,"Y")
+                .page(page);
+        return Result.OK("推广员信息列表",pageList);
+    }
+}

module-common/src/main/java/org/jeecg/api/service/impl/AppletTeamMemberServiceImpl.java

@@ -0,0 +1,11 @@
+package org.jeecg.api.service.impl;
+
+import org.jeecg.api.service.AppletTeamMemberService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class AppletTeamMemberServiceImpl implements AppletTeamMemberService {
+
+
+
+}

module-common/src/main/java/org/jeecg/modules/commonShopClass/entity/CommonShopClass.java

@@ -64,4 +64,12 @@ public class CommonShopClass implements Serializable {
     @Excel(name = "分类图片", width = 15)
     @ApiModelProperty(value = "分类图片")
     private java.lang.String icon;
+    /**加个区间*/
+    @Excel(name = "价格区间", width = 15)
+    @ApiModelProperty(value = "价格区间")
+    private java.lang.String priceNo;
+    /**单位*/
+    @Excel(name = "单位", width = 15)
+    @ApiModelProperty(value = "单位")
+    private java.lang.String unit;
 }