Merge branch 'dev' of http://10.5.52.3/youjj/cloud-platform into dev2

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

@@ -172,7 +172,11 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
             MyWallet wallet=new MyWallet();
             wallet.setUserId(userId);
             wallet=selectOne(wallet);
-            BeanUtils.copyProperties(wallet,dto);
+            if (wallet!=null){
+                BeanUtils.copyProperties(wallet,dto);
+            }else {
+                dto.setBalance(BigDecimal.ZERO);
+            }
             return  ObjectRestResponse.succ(dto);
         }catch (Exception e){
             e.printStackTrace();

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/AppUserController.java

@@ -153,7 +153,7 @@ public class AppUserController extends CommonBaseController{
             UserMemberVo memberVo=userMemberBiz.getMemberInfoByUserId(userid);
             if(memberVo!=null){
                 BeanUtils.copyProperties(userDTO,memberVo);
-                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "1,4,5,6,7", userid).getData());
+                userDTO.setPayCount(orderFeign.baseOrderCount(SYS_TRUE, "1,4,5,6,7", null, userid).getData());
                 Integer level=memberVo.getMemberLevel();
                 BaseUserMemberLevel memberLevel=userMemberLevelBiz.getLevel(level);
                 if (memberLevel!=null){

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-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -17,8 +17,8 @@ import java.util.Set;
 /**
  * Created by ace on 2017/9/15.
  */
-@FeignClient(name = "order")
+@FeignClient(name = "xx-order")
 public interface OrderFeign {
     @GetMapping("/baseOrder/count")
-    public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight,@RequestParam("multiStatus") String multiStatus, @RequestParam("userId") Integer userId);
+    public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight, @RequestParam("multiStatus") String multiStatus, @RequestParam("multiTypes") String multiTypes, @RequestParam("userId") Integer userId);
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java

@@ -298,7 +298,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
                 orderDepositRefundRecordBiz.saveNormalRecord(depositRefundRecord);
                //修改订单状态为已完成
                 baseOrder.setStatus(OrderStatusEnum.ORDER_FINISH.getCode());
-                baseOrderBiz.updateSelectiveByIdReT(baseOrder);
+                baseOrder = baseOrderBiz.updateSelectiveByIdReT(baseOrder);
                 //修改订单详情是否押金全部退还
                 orderRentVehicleDetail.setFixedLossStatus(0);
                 orderRentVehicleBiz.updateSelectiveByIdRe(orderRentVehicleDetail);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mqhandler/RabbitConsumer.java

@@ -43,6 +43,8 @@ public class RabbitConsumer {
         //通知 MQ 消息已被接收,可以ACK(从队列中删除)了
         channel.basicAck(message.getMessageProperties().getDeliveryTag(), false);
         try {
+            //设置自动取消标识
+            baseOrder.setCancelReason("超时未付款，系统自动取消订单");
             orderCancelBiz.cancel(baseOrder);
         }catch (BaseException e) {
             if(ResultCode.DB_OPERATION_FAIL_CODE == e.getStatus()) {

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -163,7 +163,8 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @ApiOperation("查询个数")
     @RequestMapping(value = "/count",method = RequestMethod.GET)
     @ResponseBody
-    public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, Integer userId){
+    @IgnoreUserToken
+    public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, String multiTypes, Integer userId){
         //查询列表数据
         WeekendSqls<BaseOrder> weekendSqls = WeekendSqls.<BaseOrder>custom();
         if(null != hasMemberRight) {
@@ -174,6 +175,11 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                     StrUtil.splitTrim(multiStatus, ",")
                             .parallelStream().map(v -> Integer.valueOf(v)).collect(Collectors.toList()));
         }
+        if(null != multiTypes) {
+            weekendSqls.andIn(BaseOrder::getType,
+                    StrUtil.splitTrim(multiTypes, ",")
+                            .parallelStream().map(v -> Integer.valueOf(v)).collect(Collectors.toList()));
+        }
         if(null != userId) {
             weekendSqls.andEqualTo(BaseOrder::getUserId, userId);
         }

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

@@ -24,6 +24,7 @@
             <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-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/controller/MQSenderController.java

@@ -2,10 +2,8 @@ package com.xxfc.platform.universal.controller;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.universal.biz.MQServiceBiZ;
-import com.xxfc.platform.universal.entity.Dictionary;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 

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;
 
     /**
      * 公司名

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java

@@ -176,11 +176,17 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
+        if(vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 2) {
+            Query query2 = new Query(vehicleBookRecordQueryVo);
+            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query2.getSuper());
+            removeStatus2(list);
+            PageHelper.startPage(pageNo, pageSize);
+            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
+            getupKeeps(vehicleBookRecordVoPageInfo.getList());
+            return RestResponse.suc(PageDataVO.pageInfo(vehicleBookRecordVoPageInfo));
+        }
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
-        if(vehicleBookRecordQueryVo.getStatus() == 2) {
-            removeStatus2(pageDataVO.getData());
-        }
         getupKeeps(pageDataVO.getData());
         return RestResponse.suc(pageDataVO);
     }
@@ -188,7 +194,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
    public void removeStatus2(List<VehicleBookRecordVo> list) {
        Iterator<VehicleBookRecordVo> iterator = list.iterator();
        while (iterator.hasNext()) {
-           if(iterator.next().getVehicleDepartureLogVo() == null) {
+           if(iterator.next().getVehicleDepartureLogVo() != null) {
                iterator.remove();
            }
        }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -544,25 +544,28 @@
         <!-- union 所有车型 -->
         <if test="startCompanyId != null or parkBranchCompanyId != null ">
             union
-            (select id as model_id,
-            <choose>
-                <when test="startCompanyId != null">
-                    #{startCompanyId} as company_id,
-                </when>
-                <otherwise>
-                    #{parkBranchCompanyId} as company_id,
-                </otherwise>
-            </choose>
+            (select vm.id as model_id, bc.id as company_id
             <if test=" catas != null ">
-                null as catas,
+                ,null as catas
             </if>
             <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
-                0 as hasVehicle,
+                ,0 as hasVehicle
             </if>
             <if test="lon != null and lat != null">
-                0 as distance
+                <!-- 处理距离 -->
+                ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
             </if>
-            from vehicle_model where vehicle_model.isdel = 0)
+            from vehicle_model vm
+                left join branch_company bc on
+                <choose>
+                    <when test="startCompanyId != null">
+                        bc.id = #{startCompanyId}
+                    </when>
+                    <otherwise>
+                        bc.id = #{parkBranchCompanyId}
+                    </otherwise>
+                </choose>
+            where vm.isdel = 0 and vm.status = 0)
         </if>
         <if test="lon != null and lat != null">
             order by