修改bug

.gitignore

@@ -0,0 +1,15 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+.idea
+package-lock.json
+node_modules/
+unpackage/
+.hbuilderx
+.vite
+target

.idea/jarRepositories.xml

@@ -36,5 +36,10 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://maven.aliyun.com/repository/public" />
+    </remote-repository>
   </component>
 </project>

admin-pc/.env.development

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

module-base/base-core/src/main/java/org/jeecg/modules/hanHaiMember/entity/HanHaiMember.java

@@ -240,7 +240,7 @@ public class HanHaiMember implements Serializable {
 	@Excel(name = "简介", width = 15)
     @ApiModelProperty(value = "简介")
     private java.lang.String details;
-	/**推广官*/
+	/**是否是推广官*/
 	@Excel(name = "推广官", width = 15)
     @ApiModelProperty(value = "推广官")
     private java.lang.String isUser;
@@ -268,4 +268,10 @@ public class HanHaiMember implements Serializable {
     @Excel(name = "是否拉黑", width = 15)
     @ApiModelProperty(value = "是否拉黑")
     private java.lang.String isBlack;
+
+
+    @Excel(name = "推广官类型", width = 15)
+    @ApiModelProperty(value = "推广官类型")
+    @Dict(dicCode = "tui_type")
+    private java.lang.String isTuiType;
 }

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

@@ -70,6 +70,7 @@ public class AppletIndexController {
     @ApiOperation(value="根据最近回收商品标识查看相关质量检测报告", notes="根据最近回收商品标识查看相关质量检测报告")
     @GetMapping(value = "/getQualityReport")
     public Result<?> getQualityReport(String goodsId){
+        //  TODO 这里是多个商品，有合格的和不合格的
         return appletIndexService.getQualityReport(goodsId);
     }
 

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

@@ -8,6 +8,7 @@ import org.jeecg.api.bean.PageBean;
 import org.jeecg.api.service.AppletIndexService;
 import org.jeecg.api.service.AppletInfoTeamService;
 import org.jeecg.common.api.vo.Result;
+import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -66,5 +67,4 @@ public class AppletInfoTeamController {
         return appletInfoTeamService.clickQualityReport(token,orderId);
     }
 
-
 }

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

@@ -63,11 +63,19 @@ public class AppletOrderController {
     }
 
 
-
-
-
-
-
-
+    //获取订单质检信息
+//    @ApiOperation(value="获取订单质检信息", notes="获取订单质检信息")
+//    @GetMapping(value = "/getOrderDetail")
+//    public Result<?> getOrderDetail(@RequestHeader("X-Access-Token") String token, String orderId) {
+//        return appletOrderService.getOrderDetail(token,orderId);
+//    }
+
+
+    //获取累计回收单数
+    @ApiOperation(value="获取累计回收单数", notes="获取累计回收单数")
+    @GetMapping(value = "/getCumulativeRecoveryCount")
+    public Result<?> getCumulativeRecoveryCount(@RequestHeader("X-Access-Token") String token) {
+        return appletOrderService.getCumulativeRecoveryCount(token);
+    }
 
 }

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

@@ -51,13 +51,12 @@ public class AppletPromotionController {
     //获取个人邀请码
     @ApiOperation(value="获取个人邀请码", notes="获取个人邀请码")
     @GetMapping(value = "/getInviteCode", produces = MediaType.IMAGE_PNG_VALUE)
-    public byte[] getInviteCode(@RequestHeader("X-Access-Token") String token){
+    public byte[] getInviteCode(String token){
         return appletPromotionService.getInviteCode2(token);
     }
 
 
 
-
     //升级推广官
     @ApiOperation(value="升级推广官", notes="升级推广官")
     @PostMapping(value = "/upgrade")
@@ -75,8 +74,6 @@ public class AppletPromotionController {
 
 
 
-
-
     //管理员：获取推广表单申请列表带分页
     @ApiOperation(value="管理员：获取推广表单申请列表带分页", notes="管理员：获取推广表单申请列表带分页")
     @GetMapping(value = "/getPromotionApplyListPage")
@@ -109,13 +106,4 @@ public class AppletPromotionController {
 
 
 
-
-
-
-
-
-
-
-
-
 }

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

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

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

@@ -1,22 +1,44 @@
 package org.jeecg.api.service.impl;
 
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.extern.log4j.Log4j2;
 import org.jeecg.api.bean.PageBean;
+import org.jeecg.api.bean.WxQrCodeVo;
 import org.jeecg.api.service.AppletInfoTeamService;
+import org.jeecg.api.wxUtils.WxHttpUtils;
 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.commonShop.entity.CommonShop;
 import org.jeecg.modules.hanHaiMember.entity.HanHaiMember;
 import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService;
+import org.springframework.beans.factory.annotation.Autowired;
+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.net.URL;
+import java.nio.file.Files;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
+@Log4j2
 public class AppletInfoTeamServiceImpl implements AppletInfoTeamService {
 
     //权限
@@ -27,6 +49,9 @@ public class AppletInfoTeamServiceImpl implements AppletInfoTeamService {
     @Resource
     private ICommonOrderService commonOrderService;
 
+    @Autowired
+    private ICommonConfigService commonConfigService;
+
     //获取用户信息列表带分页搜索
     @Override
     public Result<?> getInfoTeamListPage(String token,String name,PageBean pageBean){
@@ -95,6 +120,9 @@ public class AppletInfoTeamServiceImpl implements AppletInfoTeamService {
     public Result<?> clickQualityReport(String token,String orderId){
         HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
         CommonOrder commonOrder = commonOrderService.getById(orderId);
+
+        //
+
         return Result.OK("质检详情",commonOrder);
     }
 
@@ -130,4 +158,6 @@ public class AppletInfoTeamServiceImpl implements AppletInfoTeamService {
         hanHaiMemberService.updateById(memberInfo);
         return Result.OK("解除成功");
     }
+
+
 }

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

@@ -111,8 +111,8 @@ public class AppletOrderServiceImpl implements AppletOrderService {
         CommonOrder commonOrder = commonOrderService.lambdaQuery()
                 .eq(CommonOrder::getId,orderId)
                 .one();
-        if(commonOrder.getStatus() == 0){
-            commonOrder.setStatus(2);
+        if(commonOrder.getState() == 0){
+            commonOrder.setState(3);//取消订单
             commonOrderService.updateById(commonOrder);
         }
         return Result.OK("取消订单成功");
@@ -211,4 +211,19 @@ public class AppletOrderServiceImpl implements AppletOrderService {
         return Result.OK("创建预约订单成功");
     }
 
+    @Override
+    public Result<?> getCumulativeRecoveryCount(String token) {
+
+        HanHaiMember hanHaiMember = shiroRealm.checkUserTokenIsEffectHanHaiOpenId(token);
+
+        Long count = commonOrderService.lambdaQuery()
+                .eq(CommonOrder::getPid, "0")
+                .eq(CommonOrder::getUserId, hanHaiMember.getId())
+                .eq(CommonOrder::getState, 2)//已完成
+                .eq(CommonOrder::getStatus, 3)//现金打款
+                .count();
+
+        return Result.ok(count);
+    }
+
 }

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

@@ -10,6 +10,7 @@ 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.api.wxUtils.WxHttpUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.config.shiro.ShiroRealm;
 import org.jeecg.modules.commonConfig.entity.CommonConfig;
@@ -21,6 +22,7 @@ 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.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -55,6 +57,9 @@ public class AppletPromotionServiceImpl implements AppletPromotionService {
     @Resource
     private ICommonOrderService commonOrderService;
 
+    @Autowired
+    private WxHttpUtils wxHttpUtils;
+
     //获取推广排行榜单带分页
     @Override
     public Result<?> getRankList(PageBean pageBean){
@@ -165,7 +170,7 @@ public class AppletPromotionServiceImpl implements AppletPromotionService {
             param.put("is_hyaline", true);
 
             // 获取微信小程序码
-            String accessToken = this.getAccessToken();
+            String accessToken = wxHttpUtils.getAccessToken();
             String url = "https://api.weixin.qq.com/wxa/getwxacode?access_token=" + accessToken;
 
             // 请求微信API获取二维码图片数据
@@ -240,21 +245,6 @@ public class AppletPromotionServiceImpl implements AppletPromotionService {
         }
     }
 
-    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){

module-common/src/main/java/org/jeecg/api/wxUtils/WxHttpUtils.java

@@ -0,0 +1,33 @@
+package org.jeecg.api.wxUtils;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.TypeReference;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+public class WxHttpUtils {
+
+    @Value("${wechat.mpAppId}")
+    private String appid;
+    @Value("${wechat.mpAppSecret}")
+    private String secret;//
+    @Value("${pay.mchId}")
+    private String mchId;//
+    private static String shipmentUrl = "https://api.weixin.qq.com/wxa/sec/order/upload_shipping_info?access_token=";
+
+    /**
+     * 获取令牌
+     *
+     * @return
+     */
+    public 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");
+    }
+}

module-common/src/main/java/org/jeecg/modules/commonOrder/entity/CommonOrder.java

@@ -171,13 +171,18 @@ public class CommonOrder implements Serializable {
 	@Dict(dictTable = "han_hai_member", dicText = "name", dicCode = "id")
     @ApiModelProperty(value = "质检员")
     private java.lang.String isUserId;
-
-
-	@TableField (exist=false)
-	private List<CommonOrder> commonOrderList;
 	/**品牌标识*/
 	@Excel(name = "品牌标识", width = 15)
 	@ApiModelProperty(value = "品牌标识")
 	private java.lang.String pinId;
 
+	@Excel(name = "快递员电话", width = 15)
+	@ApiModelProperty(value = "快递员电话")
+	private String deliveryPhone;
+
+
+	@TableField (exist=false)
+	private List<CommonOrder> commonOrderList;
+
+
 }

module-common/src/main/java/org/jeecg/modules/commonVip/entity/CommonVip.java

@@ -56,4 +56,8 @@ public class CommonVip implements Serializable {
 	@Excel(name = "品牌名称", width = 15)
     @ApiModelProperty(value = "品牌名称")
     private java.lang.String name;
+    /**品牌图片*/
+    @Excel(name = "品牌图片", width = 15)
+    @ApiModelProperty(value = "品牌图片")
+    private java.lang.String image;
 }

module-system/src/main/resources/application-dev.yml

@@ -1,5 +1,5 @@
 server:
-  port: 8081
+  port: 8002
   tomcat:
     max-swallow-size: -1
   error: