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

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/SellingWalletVo.java

 package com.github.wxiaoqi.security.admin.vo;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -57,8 +58,27 @@ public class SellingWalletVo {
 
     @ApiModelProperty("'类别：0-正；1-负(退款时)")
     private Integer status;
+
+    @JSONField(serialize = false)
+    private Integer sourceId;
+
+    @JSONField(serialize = false)
+    private BigDecimal commissionnm;
     /**
      * 所获佣金
      */
     private BigDecimal commission;
+
+    /**
+     * 订单状态
+     */
+    private Integer sellerStatus;
+    /**
+     * 订单文案
+     */
+    private String statusText;
+    /**
+     * 是否显示 默认false
+     */
+    private Boolean isShow;
 }

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

@@ -128,7 +128,7 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         for (AppUserPositionTemp appUserPositionTemp : data) {
             appUserPositionTempVo = new AppUserPositionTempVo();
             BeanUtils.copyProperties(appUserPositionTemp, appUserPositionTempVo);
-            String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId()).getName();
+            String postionName = postionMap == null ? "" : postionMap.get(appUserPositionTemp.getPositionId())==null?"":postionMap.get(appUserPositionTemp.getPositionId()).getName();
             appUserPositionTempVo.setPositionName(postionName);
             appUserPositionTempVo.setStatus(appUserPositionTemp.getUserId() == null ? DataStatus.NO_USERED.code : DataStatus.USERED.code);
             appUserPositionTempVos.add(appUserPositionTempVo);

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

@@ -5,7 +5,6 @@ import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.bo.UserTeamMemberBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
-import com.github.wxiaoqi.security.admin.entity.AppUserRelation;
 import com.github.wxiaoqi.security.admin.vo.UserTeamMemberVo;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.apache.commons.collections.CollectionUtils;

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserSellingWaterMapper.java

@@ -2,6 +2,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 
 import com.github.wxiaoqi.security.admin.bo.UserIncomeBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserSellingWater;
+import com.github.wxiaoqi.security.admin.vo.SellingWalletVo;
 import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
@@ -20,4 +21,6 @@ public interface AppUserSellingWaterMapper extends Mapper<AppUserSellingWater> {
     List<UserIncomeBo> accquireIncomeByMemberIds(@Param("parentId") Integer parentId);
 
     BigDecimal selectTotalIncomeByUserId(@Param("userId") Integer userId);
+
+    List<SellingWalletVo> selectSellerWalterByUserIdAndWating(@Param("userId") Integer userId, @Param("wating") Integer wating);
 }

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

@@ -2,14 +2,12 @@ package com.github.wxiaoqi.security.admin.rest;
 
 import com.github.wxiaoqi.security.admin.biz.UserBusinessBiz;
 import com.github.wxiaoqi.security.admin.bo.PromoteBO;
-import com.github.wxiaoqi.security.admin.bo.UserTeamMemberBo;
 import com.github.wxiaoqi.security.admin.vo.UserTeamMemberVo;
 import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.auth.client.jwt.UserAuthUtil;
 import com.github.wxiaoqi.security.auth.common.util.jwt.IJWTInfo;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

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

@@ -48,4 +48,17 @@ public class UserSellingWaterController {
         }
     }
 
+    @GetMapping("/pagea")
+    public ObjectRestResponse<SellingWalletPagVo> findSellingWaterPagea(@RequestParam(required = false,value = "type") Integer wating,
+                                                                       @RequestParam("pageNo") Integer pageNo,
+                                                                       @RequestParam("pageSize") Integer pageSize,
+                                                                       HttpServletRequest request) {
+        try {
+            IJWTInfo infoFromToken = userAuthUtil.getInfoFromToken(userAuthConfig.getToken(request));
+            SellingWalletPagVo sellingWalletPagVo = appUserSellingWaterBiz.findSellingWaterPageForAppByWaiting(wating, Integer.valueOf(infoFromToken.getId()), pageNo, pageSize);
+            return ObjectRestResponse.succ(sellingWalletPagVo);
+        } catch (Exception e) {
+            throw new BaseException(e);
+        }
+    }
 }

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

@@ -7,14 +7,14 @@
       SELECT
    aur.user_id,
    aur.bind_time as `leagueTime`,
-	 ausww.income
+	 IFNULL(ausww.income,0)  AS `income`
 FROM
 	`app_user_relation` AS `aur`
 	LEFT JOIN (SELECT DISTINCT
 	`source_id` AS userId,
 	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 )
+	( SELECT IFNULL(SUM( commission ),0) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 0 ) - ( SELECT IFNULL(SUM( commission ),0) FROM `app_user_selling_water` WHERE source_id = ausw.source_id AND `status` = 1 )
 	),
 	0
 	) AS `income`
@@ -31,4 +31,48 @@ FROM
 	( 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>
+
+    <select id="selectSellerWalterByUserIdAndWating" resultType="com.github.wxiaoqi.security.admin.vo.SellingWalletVo">
+        <!--        SELECT
+                *
+                FROM
+                (
+                SELECT
+                ausw.*,
+                IFNULL( ausw.commission, 0 ) - IFNULL( auswt.commission, 0 ) AS `commissionnm`,
+                auswt.status AS  sellerStatus,
+                IFNULL(auswt.status,0) AS `isShow`
+                FROM
+                ( SELECT * FROM `app_user_selling_water` WHERE STATUS = 0 AND `user_id`=#{userId} <if test="wating!=null">
+                AND `waiting`=#{wating} &lt;!&ndash;AND `status`=0&ndash;&gt;
+            </if>) AS `ausw`
+                LEFT JOIN ( SELECT * FROM `app_user_selling_water` WHERE STATUS = 1 AND `user_id`=#{userId} <if
+                    test="wating!=null">
+                AND `waiting`=#{wating} &lt;!&ndash;AND `status`=0&ndash;&gt;
+            </if>) AS `auswt` ON auswt.order_no = ausw.order_no
+                ) AS `auswres`
+                ORDER BY 	crt_time DESC-->
+
+
+        SELECT w.*,o.commission as commission ,o.type AS `sellerStatus` FROM (
+        SELECT t.order_no,IFNULL(SUM(t.z),0)-IFNULL(SUM(t.f),0) as commission,IF(SUM(t.f)>0,'1',0)as type FROM (
+
+        SELECT order_no,commission as z,0 as f FROM app_user_selling_water WHERE user_id=#{userId}
+        AND `status`=0 and commission>0
+        UNION
+        SELECT order_no,0 as z,commission as f FROM app_user_selling_water WHERE user_id=#{userId}
+        AND `status`=1 and commission>0
+        ) as t
+        GROUP BY t.order_no
+        ) o LEFT JOIN ( SELECT order_no,user_id,source_id,order_type,img,price,title,waiting,`crt_time` FROM
+        app_user_selling_water WHERE
+        id IN ( SELECT MAX( id ) FROM app_user_selling_water GROUP BY order_no)) w
+        ON o.order_no=w.order_no
+        where 1=1
+        <if test="wating!=null">
+            and `waiting`= #{wating} and  <![CDATA[
+                o.`type`<>1 ]]>
+        </if>
+        ORDER BY `crt_time`
+    </select>
 </mapper>
\ No newline at end of file

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

@@ -64,9 +64,12 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                     if(array.size()>0){
                         for(int i=0;i<array.size();i++){
                             Integer id=array.getJSONObject(i).getInteger("id");
+                            Coupon coupon=couponBiz.selectById(id);
+                            if (coupon!=null&&coupon.getIsDel()==0&&coupon.getStatus()==1){
                                 coupons.add(couponBiz.selectById(id));
                             }
                         }
+                    }
                     ruleVo.setCoupons(coupons);
                 }
             }

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

@@ -55,7 +55,6 @@ public class VehicleModelBiz extends BaseBiz<VehicleModelMapper, VehicleModel> {
         try {
             PageDataVO<VehicleModelVo> mPageDataVO = PageDataVO.pageInfo(vmqc.getPage(),
                     vmqc.getLimit(), () -> mapper.findVehicleModelPage(vmqc));
-
             return ObjectRestResponse.succ(mPageDataVO);
         } catch (Exception e) {
             e.printStackTrace();