Merge remote-tracking branch 'origin/dev' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBusinessBiz.java

@@ -80,8 +80,9 @@ public class UserBusinessBiz {
                 userTeamMemberBo.setHeadUrl(appUserDetail==null?"":appUserDetail.getHeadimgurl());
                 userTeamMemberBo.setNickName(appUserDetail==null?"":appUserDetail.getNickname());
             }
-            userTeamMemberBo.setIncome(memberIdAndIncomeMap.get(appUserRelation.getUserId()));
-            totalIncome = totalIncome.add(userTeamMemberBo.getIncome());
+            BigDecimal income=memberIdAndIncomeMap.get(appUserRelation.getUserId())==null?BigDecimal.ZERO:memberIdAndIncomeMap.get(appUserRelation.getUserId());
+            userTeamMemberBo.setIncome(income);
+            totalIncome = totalIncome.add(income);
             userTeamMemberBos.add(userTeamMemberBo);
         }
         userTeamMemberVo.setPageNum(memberPage.getPageNum());

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/UserBussinessController.java

@@ -41,7 +41,7 @@ public class UserBussinessController {
      public ObjectRestResponse<UserTeamMemberVo> findTeamPage(@RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize, HttpServletRequest request){
          try {
              IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
-             UserTeamMemberVo userTeamMemberVo = businessBiz.findTeamMemberPageByUserId(Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+             UserTeamMemberVo userTeamMemberVo = businessBiz.findTeamMemberPageByUserId(270, pageNo, pageSize);
              return ObjectRestResponse.succ(userTeamMemberVo);
          } catch (Exception e) {
            throw new BaseException(e);

ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

@@ -77,11 +77,11 @@
         inner join
         (select * from app_user_detail where 1=1 <if test="postionState != null">
            <choose>
-               <when test="postionState == 0">
+               <when test="postionState == 6">
                  and  `position_id`=#{postionState}
                </when>
                <otherwise>
-                  and <![CDATA[`position_id`<>#{postionState}]]>
+                  and <![CDATA[`position_id`<>6]]>
                </otherwise>
            </choose>
     </if>) d

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -6,10 +6,10 @@
     <select id="accquireIncomeByMemberIds" resultType="com.github.wxiaoqi.security.admin.bo.UserIncomeBo">
         SELECT DISTINCT
         `source_id`as userId,
-        (( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 0 AND
+        IFNULL((( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 0 AND
         `waiting` = 1 )
         - ( SELECT SUM(commission) FROM `app_user_selling_water` WHERE source_id=ausw.source_id AND `status` = 1 AND
-        `waiting` = 1 )) as `income`
+        `waiting` = 1 )),0) as `income`
         FROM
         `app_user_selling_water` as ausw
         WHERE
@@ -23,7 +23,7 @@
         SELECT
 	( auswu.upIncome - auswd.dowIncome ) AS `income`
 FROM
-	( SELECT SUM( commission ) AS upIncome FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id` = #{userId}  ) AS `auswu`,
-	( SELECT SUM( commission ) AS `dowIncome` FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id` = #{userId}  ) AS `auswd`;
+	( SELECT IFNULL(SUM( commission ),0) AS upIncome FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id` = #{userId}  ) AS `auswu`,
+	( SELECT IFNULL(SUM( commission ),0) AS `dowIncome` FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id` = #{userId}  ) AS `auswd`;
     </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-api/pom.xml

@@ -24,6 +24,18 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-order-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.github.wxiaoqi</groupId>
+            <artifactId>ace-auth-client</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

xx-activity/xx-activity-server/pom.xml

@@ -18,12 +18,7 @@
             <artifactId>xx-activity-api</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>com.xxfc.platform</groupId>
-            <artifactId>xx-order-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
+
     </dependencies>
 
     <build>

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -138,6 +138,9 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             log.error("----参数不能为空");
             return  ObjectRestResponse.createFailedResult(ResultCode.NULL_CODE,"参数不能为空");
         }
+        if (amout.compareTo(BigDecimal.ZERO)<1){
+            return  ObjectRestResponse.succ();
+        }
         Long time=System.currentTimeMillis();
         List<UserCouponVo> list=mapper.getUserCouponsByType(userId,type,time,channel);
         List<UserCouponVo> list1=new ArrayList<>();

xx-activity/xx-activity-server/src/main/resources/mapper/IntegralSignRecordMapper.xml

@@ -12,7 +12,7 @@
     <result column="last_time" property="lastTime" jdbcType="BIGINT" />
   </resultMap>
 
-    <select id="Id" parameterType="java.lang.Integer" resultType="com.xxfc.platform.activity.entity.IntegralSignRecord">
+    <select id="selectByUserId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.activity.entity.IntegralSignRecord">
       select * from integral_sign_record
       where user_id = #{userId} and isdel = 0
       order by last_time

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/BuyVehicleFormBiz.java

@@ -73,7 +73,7 @@ public class BuyVehicleFormBiz extends BaseBiz<BuyVehicleFormMapper, BuyVehicleF
             if(comanyLeaderVoMap!=null) {
                 BranComanyLeaderVo branComanyLeaderVo = comanyLeaderVoMap.get(buyVehicleForm.getCompanyId());
                 buyVehicleFormPageVo.setLeaderName(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getLeader());
-                buyVehicleFormPageVo.setLeaderPhone(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getPhone());
+                buyVehicleFormPageVo.setLeaderPhone(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getLeaderContactInfo());
                 buyVehicleFormPageVo.setCompanyName(branComanyLeaderVo == null ? "" : branComanyLeaderVo.getName());
             }
             buyVehicleFormPageVoList.add(buyVehicleFormPageVo);

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/dto/CampsiteShopAdminDTO.java

@@ -162,4 +162,7 @@ public class CampsiteShopAdminDTO {
      */
     private List<Integer>  campsiteTagDTOS;
 
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
+
 }

xx-campsite/xx-campsite-api/src/main/java/com/xxfc/platform/campsite/entity/CampsiteShop.java

@@ -209,4 +209,8 @@ public class CampsiteShop implements Serializable {
     @Column(name = "sale_state")
     @ApiModelProperty(value = "上下架状态 0-创建状态  1-上架 2-下架")
     private Integer saleState;
+
+    @Column(name = "poster_background")
+    @ApiModelProperty(value = "海报背景")
+    private String posterBackground;
 }

xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java

@@ -145,7 +145,8 @@ public class MsgBiz {
             query.with(pageable);
             query.with(new Sort(Sort.Direction.DESC, "time"));
             List<Msg> msgList = fetchAndAttach(mongoTemplate.find(query, Msg.class, "s_msg"), userId);
-            PageInfo<Msg> goodPageInfo = new PageInfo<>(msgList);
+            List<MsgVo> msgVoList = replaceMsgResult(msgList);
+            PageInfo<MsgVo> goodPageInfo = new PageInfo<>(msgVoList);
             goodPageInfo.setPageSize(totalSize%limit == 0 ?totalSize/limit : totalSize/limit + 1);
             return ObjectRestResponse.succ(goodPageInfo);
 

xx-universal/xx-universal-server/pom.xml

@@ -24,6 +24,12 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.xxfc.platform</groupId>
+            <artifactId>xx-activity-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
         <dependency>
             <groupId>com.aliyun</groupId>
             <artifactId>aliyun-java-sdk-core</artifactId>

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/MQServiceBiZ.java

 package com.xxfc.platform.universal.biz;
 
+import com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.amqp.core.Message;
 import org.springframework.amqp.core.MessageBuilder;
 import org.springframework.amqp.core.MessageProperties;
@@ -12,6 +14,8 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.util.UUID;
 
+import static com.github.wxiaoqi.security.common.config.rabbit.RabbitConstant.INTEGRAL_TOPIC;
+
 @Service
 @Slf4j
 public class MQServiceBiZ {
@@ -23,6 +27,12 @@ public class MQServiceBiZ {
     public ObjectRestResponse sendMessage(String exchange, String routKey, String json) {
         log.info("发送消息到消息队列：exchange = {}, routingKey = {}, json = {}", exchange, routKey, json);
         log.info("开始发送消息。。。");
+       if(StringUtils.isBlank(exchange)) {
+           exchange = INTEGRAL_TOPIC;
+       }
+       if (StringUtils.isBlank(routKey)) {
+           routKey = RabbitConstant.INTEGRAL_ROUTING_KEY;
+       }
         Message message = MessageBuilder.withBody(json.getBytes())
                 .setContentType(MessageProperties.CONTENT_TYPE_JSON).setContentEncoding("utf-8")
                 .setMessageId(UUID.randomUUID() + "").build();

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/BranComanyLeaderVo.java

@@ -18,7 +18,7 @@ public class BranComanyLeaderVo {
     /**
      * 负责人联系电话
      */
-    private String phone;
+    private String leaderContactInfo;
 
     /**
      * 公司名