commit+1

competition/src/main/java/com/huoran/competition/entity/Competition.java

@@ -92,7 +92,7 @@ public class Competition implements Serializable {
     private String reportingPlace;
 
 
-    @ApiModelProperty(value = "创建来源(0默认平台创建)")
+    @ApiModelProperty(value = "创建来源(0默认平台创建 1...待定)")
     private Integer createSource;
 
 

competition/src/main/java/com/huoran/competition/entity/req/PageCompetitionListReq.java

@@ -53,4 +53,7 @@ public class PageCompetitionListReq extends PageReq{
 
     @ApiModelProperty(value = "是否登录:-1未登录/1已登录")
     private Integer isLogin;
+
+    @ApiModelProperty(value = "创建来源(0默认平台创建 1...待定)")
+    private Integer createSource;
 }

competition/src/main/java/com/huoran/competition/mapper/xml/CompetitionMapper.xml

@@ -94,6 +94,10 @@
             and create_time between #{req.startTime} and #{req.endTime}
         </if>
 
+        <if test=" req.createSource=null">
+            and create_source  = #{req.createSource}
+        </if>
+
         <if test=" req.platformSource!=null ">
             and platform_source =#{req.platformSource}
         </if>

nakadai/src/main/java/com/huoran/nakadai/controller/AliRealNameAuthenticationController.java

@@ -258,10 +258,10 @@ public class AliRealNameAuthenticationController {
         userInfoUpdateWrapper.eq("user_id", userAccount1.getUserId());
         userInfoService.update(new HrUserInfo(), userInfoUpdateWrapper);*/
 
-        UserInfo userInfo = new UserInfo();
+        /*UserInfo userInfo = new UserInfo();
         userInfo.setUserName(enterpriseCertification.getCompanyName());
         userInfo.setUserId(userAccount1.getUserId());
-        enterpriseCertificationService.updateUserInfo(userInfo);
+        enterpriseCertificationService.updateUserInfo(userInfo);*/
 
         //删除团队信息
 //        enterpriseCertificationService.deleteTeamInformation(enterpriseCertification.getAccountId());

nakadai/src/main/java/com/huoran/nakadai/controller/PlatformTeamAccountController.java

@@ -17,10 +17,12 @@ import com.huoran.nakadai.service.PlatformTeamClassificationService;
 import com.huoran.nakadai.service.PlatformTeamService;
 import com.huoran.nakadai.service.SupplierClassificationConfigService;
 import com.huoran.nakadai.utils.GenerateCodeUtil;
+import com.huoran.nakadai.utils.ali.HttpUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpResponse;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -29,6 +31,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.validation.Valid;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -241,5 +244,38 @@ public class PlatformTeamAccountController {
     public R inviteJoinOrganization(@RequestBody @Valid InviteJoinInfo inviteJoinInfo) {
         return platformTeamAccountService.inviteJoinOrganization(inviteJoinInfo);
     }
+
+    public static void main(String[] args) {
+        String host = "https://gpsyl.market.alicloudapi.com";
+        String path = "/ai_market/kg/gu_piao_shi_ying_lv/v1";
+        String method = "GET";
+        String appcode = "4c22c2b34b2d4b5aaa57186a49aa3a4c";
+        Map<String, String> headers = new HashMap<String, String>();
+        //最后在header中的格式(中间是英文空格)为Authorization:APPCODE 83359fd73fe94948385f570e3c139105
+        headers.put("Authorization", "APPCODE " + appcode);
+        Map<String, String> querys = new HashMap<String, String>();
+        querys.put("PRICE", "6.5899");
+        querys.put("PROFIT", "1");
+
+
+        try {
+            /**
+             * 重要提示如下:
+             * HttpUtils请从
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/src/main/java/com/aliyun/api/gateway/demo/util/HttpUtils.java
+             * 下载
+             *
+             * 相应的依赖请参照
+             * https://github.com/aliyun/api-gateway-demo-sign-java/blob/master/pom.xml
+             */
+            HttpResponse response = HttpUtils.doGet(host, path, method, headers, querys);
+            System.out.println(response.toString());
+            //获取response的body
+            //System.out.println(EntityUtils.toString(response.getEntity()));
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
 }
 

nakadai/src/main/java/com/huoran/nakadai/entity/ExplosiveRecommendation.java

@@ -71,6 +71,9 @@ public class ExplosiveRecommendation implements Serializable {
     @ApiModelProperty(value = "跳转链接")
     private String  jumpLink;
 
+    @ApiModelProperty(value = "描述")
+    private String  description;
+
     @ApiModelProperty(value = "发布状态(0默认未发布/1已发布)")
     private Integer  publishStatus;
 

nakadai/src/main/java/com/huoran/nakadai/entity/vo/TeamClassificationVO.java

@@ -30,6 +30,10 @@ public class TeamClassificationVO {
     @ApiModelProperty(value = "供应商分类配置id")
     private Integer classificationConfigId;
 
+    @ApiModelProperty(value = "联系号码")
+    private String phone;
+
+
 
 
 }

nakadai/src/main/java/com/huoran/nakadai/mapper/xml/PlatformTeamMapper.xml

@@ -10,7 +10,8 @@
             sc.classification_name AS supplierClassificationName,
             sc.id AS supplierClassificationId,
             t.id AS teamId,
-            cc.id AS classificationConfigId
+            cc.id AS classificationConfigId,
+            c.phone
         FROM
             k_platform_team t
                 INNER JOIN k_platform_team_account ta ON ta.manage_id = t.manage_id