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

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);
+            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/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(270, pageNo, pageSize);
+             UserTeamMemberVo userTeamMemberVo = businessBiz.findTeamMemberPageByUserId(Integer.valueOf(infoFromToken.getId()), 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

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-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()) {