修改支付接口判断

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbFileController.java

@@ -112,6 +112,13 @@ public class DbFileController extends BaseController {
                           @PathVariable Long[] ids) {
         return toAjax(iDbFileService.deleteWithValidByIds(Arrays.asList(ids), true));
     }
+
+    /**
+     * 上传文件
+     * @param file
+     * @param req
+     * @return
+     */
     @SaCheckPermission("xinrenli:file:upload")
     @Log(title = "文件", businessType = BusinessType.DELETE)
     @PostMapping("/upload")

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbInviterController.java

@@ -3,6 +3,8 @@ package com.yongqi.xinrenli.controller;
 import java.util.List;
 import java.util.Arrays;
 
+import com.yongqi.common.core.domain.model.LoginUser;
+import com.yongqi.common.helper.LoginHelper;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +47,8 @@ public class DbInviterController extends BaseController {
     @SaCheckPermission("xinrenli:Inviter:list")
     @GetMapping("/list")
     public TableDataInfo<DbInviterVo> list(DbInviterBo bo, PageQuery pageQuery) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        bo.setInviterId(loginUser.getUserId());
         return iDbInviterService.queryPageList(bo, pageQuery);
     }
 

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbOrderController.java

@@ -177,12 +177,13 @@ public class DbOrderController extends BaseController {
     @SaCheckPermission("xinrenli:order:pay")
     @Log(title = "下单", businessType = BusinessType.OTHER)
     @GetMapping("/orderPay")
-    public R orderPay(@NotNull(message = "主键不能为空") @RequestParam("id") Long orderId
-        , @RequestParam(value = "id", required = false) Long couponId
+    public R orderPay(@NotNull(message = "主键不能为空") @RequestParam("orderId") Long orderId
+        ,Long couponId
+        ,Long discountId
         , HttpServletRequest request) {
         LoginUser loginUser = LoginHelper.getLoginUser();
         String ipAddr = AddressUtils.getIpAddr(request);
-        return iDbOrderService.orderPay(orderId, couponId, loginUser, ipAddr);
+        return iDbOrderService.orderPay(orderId, couponId,discountId, loginUser, ipAddr);
     }
 
     /**
@@ -236,10 +237,10 @@ public class DbOrderController extends BaseController {
      */
     @SaCheckPermission("xinrenli:order:exportReportForms")
     @Log(title = "订单", businessType = BusinessType.EXPORT)
-    @PostMapping("/exportReportForms")
+    @GetMapping("/exportReportForms")
     public R<Void> exportReportForms(HttpServletResponse response) {
         try {
-            ReportFormsVo vo = iDbOrderService.reportForms();
+            ReportFormsVo vo = iDbOrderService.reportFormsExl();
             List<ReportFormsVo> list = new ArrayList<>();
             list.add(vo);
             ExcelUtil.exportExcel(list, "订单", ReportFormsVo.class, response);

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserCommentController.java

@@ -82,7 +82,7 @@ public class DbUserCommentController extends BaseController {
     public R<Void> add(@Validated(AddGroup.class) @RequestBody DbUserCommentBo bo) {
         LoginUser loginUser = getLoginUser();
         bo.setUserId(loginUser.getUserId());
-        return toAjax(iDbUserCommentService.insertByBo(bo));
+        return toAjax(iDbUserCommentService.insertByBo(bo,loginUser));
     }
 
     /**

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/controller/DbUserDiscountController.java

@@ -3,6 +3,8 @@ package com.yongqi.xinrenli.controller;
 import java.util.List;
 import java.util.Arrays;
 
+import com.yongqi.common.core.domain.model.LoginUser;
+import com.yongqi.common.helper.LoginHelper;
 import lombok.RequiredArgsConstructor;
 
 import javax.servlet.http.HttpServletResponse;
@@ -45,6 +47,8 @@ public class DbUserDiscountController extends BaseController {
     @SaCheckPermission("xinrenli:userDiscount:list")
     @GetMapping("/list")
     public TableDataInfo<DbUserDiscountVo> list(DbUserDiscountBo bo, PageQuery pageQuery) {
+        LoginUser loginUser = LoginHelper.getLoginUser();
+        bo.setUserId(loginUser.getUserId());
         return iDbUserDiscountService.queryPageList(bo, pageQuery);
     }
 

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/DbOrder.java

@@ -81,6 +81,10 @@ public class DbOrder {
      */
     private Long useCouponId;
     /**
+     * 使用折扣id
+     */
+    private Long useDiscountId;
+    /**
      * 备注说明
      */
     private String remark;

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/bo/DbUserCommentBo.java

@@ -37,7 +37,7 @@ public class DbUserCommentBo extends BaseEntity {
     /**
      * 用户id
      */
-    @NotNull(message = "用户id不能为空", groups = {AddGroup.class, EditGroup.class})
+    @NotNull(message = "用户id不能为空", groups = { EditGroup.class})
     private Long userId;
 
     /**

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/DbUserCommentVo.java

@@ -71,6 +71,9 @@ public class DbUserCommentVo {
      */
     @ExcelProperty(value = "删除状态")
     private Integer deleteStatus;
-
+    /**
+     * 用户名称
+     */
+    private String userName;
 
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/ReportFormsVo.java

@@ -45,5 +45,16 @@ public class ReportFormsVo {
      */
     @ExcelProperty(value = "已完成/未完成订单对比")
     private String contrastOrder;
-
+    /**
+     * 金额
+     */
+    private Integer Money;
+    /**
+     * 未完成
+     */
+    private Integer NoAccomplish;
+    /**
+     * 已完成和未完成总量
+     */
+    private Integer sum;
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/domain/vo/WxPayOrderResult.java

@@ -41,5 +41,12 @@ public class WxPayOrderResult {
     @DateTimeFormat(pattern = "yyyy/MM/dd HH:mm:ss")
     @JsonFormat(pattern = "yyyy/MM/dd HH:mm:ss")
     private Date createTime;
-
+    /**
+     * 固定值
+     */
+    private String packageValue;
+    /**
+     *
+     */
+    private String paySign;
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbCouponMapper.java

 package com.yongqi.xinrenli.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yongqi.xinrenli.domain.DbCoupon;
+import com.yongqi.xinrenli.domain.DbOrder;
 import com.yongqi.xinrenli.domain.bo.DbCouponBo;
 import com.yongqi.xinrenli.domain.vo.DbCouponVo;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
+import com.yongqi.xinrenli.domain.vo.DbOrderVo;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 优惠卷Mapper接口
@@ -12,5 +18,7 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
  * @date 2023-03-09
  */
 public interface DbCouponMapper extends BaseMapperPlus<DbCouponMapper, DbCoupon, DbCouponVo> {
+    Page<DbCouponVo> selectVoPageList(@Param("page") Page<DbCouponVo> page, @Param(Constants.WRAPPER) Wrapper<DbCoupon> queryWrapper);
 
+    DbCouponVo selectVoByIds(Long id);
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbInviterMapper.java

@@ -12,4 +12,5 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
  */
 public interface DbInviterMapper extends BaseMapperPlus<DbInviterMapper, DbInviter, DbInviterVo> {
 
+    Integer InvitedCount(Long inviterId);
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbOrderMapper.java

@@ -32,6 +32,8 @@ public interface DbOrderMapper extends BaseMapperPlus<DbOrderMapper, DbOrder, Db
 
     Integer createPay(DbOrderEditBo bo);
 
+    ReportFormsVo reportFormsExl();
+
     ReportFormsVo reportForms();
 
     Integer unpaidJob();

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/mapper/DbUserCommentMapper.java

 package com.yongqi.xinrenli.mapper;
 
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yongqi.xinrenli.domain.DbOrder;
 import com.yongqi.xinrenli.domain.DbUserComment;
+import com.yongqi.xinrenli.domain.vo.DbOrderVo;
 import com.yongqi.xinrenli.domain.vo.DbUserCommentVo;
 import com.yongqi.common.core.mapper.BaseMapperPlus;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 用户评论Mapper接口
@@ -12,4 +19,7 @@ import com.yongqi.common.core.mapper.BaseMapperPlus;
  */
 public interface DbUserCommentMapper extends BaseMapperPlus<DbUserCommentMapper, DbUserComment, DbUserCommentVo> {
 
+
+
+    Page<DbUserCommentVo> selectUserPage(Page<DbUserCommentVo> page, @Param(Constants.WRAPPER) LambdaQueryWrapper<DbUserComment> queryWrapper);
 }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbOrderService.java

@@ -69,10 +69,16 @@ public interface IDbOrderService {
      */
     TableDataInfo<DbOrderVo> homeList(DbOrderBo bo, PageQuery pageQuery);
 
-    R orderPay(Long id, Long couponId, LoginUser loginUser, String ipAddr);
+    R orderPay(Long id, Long couponId, Long discountId,LoginUser loginUser, String ipAddr);
 
     ReportFormsVo reportForms();
 
+    /**
+     * 报表
+     * @return
+     */
+    ReportFormsVo reportFormsExl();
+
     Boolean createPay(DbOrderEditBo bo);
 
     /**

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/IDbUserCommentService.java

 package com.yongqi.xinrenli.service;
 
+import com.yongqi.common.core.domain.model.LoginUser;
 import com.yongqi.xinrenli.domain.vo.DbUserCommentVo;
 import com.yongqi.xinrenli.domain.bo.DbUserCommentBo;
 import com.yongqi.common.core.page.TableDataInfo;
@@ -34,7 +35,7 @@ public interface IDbUserCommentService {
     /**
      * 新增用户评论
      */
-    Boolean insertByBo(DbUserCommentBo bo);
+    Boolean insertByBo(DbUserCommentBo bo, LoginUser loginUser);
 
     /**
      * 修改用户评论

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbCouponServiceImpl.java

@@ -38,7 +38,7 @@ public class DbCouponServiceImpl implements IDbCouponService {
      */
     @Override
     public DbCouponVo queryById(Long id) {
-        return baseMapper.selectVoById(id);
+        return baseMapper.selectVoByIds(id);
     }
 
     /**
@@ -47,7 +47,7 @@ public class DbCouponServiceImpl implements IDbCouponService {
     @Override
     public TableDataInfo<DbCouponVo> queryPageList(DbCouponBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<DbCoupon> lqw = buildQueryWrapper(bo);
-        Page<DbCouponVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<DbCouponVo> result = baseMapper.selectVoPageList(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbInviterServiceImpl.java

@@ -7,6 +7,12 @@ import com.yongqi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yongqi.xinrenli.domain.DbFile;
+import com.yongqi.xinrenli.domain.DbUserDiscount;
+import com.yongqi.xinrenli.domain.vo.DbFileVo;
+import com.yongqi.xinrenli.enums.DeleteStatusEnum;
+import com.yongqi.xinrenli.enums.FileEnumServiceType;
+import com.yongqi.xinrenli.mapper.DbUserDiscountMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.yongqi.xinrenli.domain.bo.DbInviterBo;
@@ -15,6 +21,7 @@ import com.yongqi.xinrenli.domain.DbInviter;
 import com.yongqi.xinrenli.mapper.DbInviterMapper;
 import com.yongqi.xinrenli.service.IDbInviterService;
 
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 import java.util.Collection;
@@ -30,7 +37,7 @@ import java.util.Collection;
 public class DbInviterServiceImpl implements IDbInviterService {
 
     private final DbInviterMapper baseMapper;
-
+    private final DbUserDiscountMapper DbUserDiscountMapper;
     /**
      * 查询邀请
      */
@@ -79,6 +86,23 @@ public class DbInviterServiceImpl implements IDbInviterService {
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setId(add.getId());
+//            List<DbInviterVo> count = baseMapper.selectVoList(Wrappers.<DbInviter>lambdaQuery()
+//                .eq(DbInviter::getInviterId, bo.getInviterId())
+//                .eq(DbInviter::getStatus, 1));
+//            if(count.size()==3){
+//                DbUserDiscount dis = new DbUserDiscount();
+//                dis.setUserId(bo.getInviterId());
+//                dis.setDiscountRatio(BigDecimal.valueOf(0.9));
+//                dis.setUseStatus(0);
+//               Boolean  f = DbUserDiscountMapper.insert(dis) > 0;
+//                 if(f){
+//                    for(DbInviterVo d : count){
+//                        DbInviter inviter = BeanUtil.toBean(d, DbInviter.class);
+//                        inviter.setStatus(0);
+//                        baseMapper.updateById(inviter);
+//                    }
+//                 }
+//            }
         }
         return flag;
     }

yongqi-xinrenli/src/main/java/com/yongqi/xinrenli/service/impl/DbUserCommentServiceImpl.java

 package com.yongqi.xinrenli.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.yongqi.common.core.domain.model.LoginUser;
 import com.yongqi.common.utils.StringUtils;
 import com.yongqi.common.core.page.TableDataInfo;
 import com.yongqi.common.core.domain.PageQuery;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yongqi.xinrenli.domain.DbWxUser;
+import com.yongqi.xinrenli.domain.vo.DbWxUserVo;
+import com.yongqi.xinrenli.mapper.DbWxUserMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import com.yongqi.xinrenli.domain.bo.DbUserCommentBo;
@@ -30,7 +35,7 @@ import java.util.Collection;
 public class DbUserCommentServiceImpl implements IDbUserCommentService {
 
     private final DbUserCommentMapper baseMapper;
-
+    private final DbWxUserMapper wxUserMapper;
     /**
      * 查询用户评论
      */
@@ -45,7 +50,7 @@ public class DbUserCommentServiceImpl implements IDbUserCommentService {
     @Override
     public TableDataInfo<DbUserCommentVo> queryPageList(DbUserCommentBo bo, PageQuery pageQuery) {
         LambdaQueryWrapper<DbUserComment> lqw = buildQueryWrapper(bo);
-        Page<DbUserCommentVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        Page<DbUserCommentVo> result = baseMapper.selectUserPage(pageQuery.build(), lqw);
         return TableDataInfo.build(result);
     }
 
@@ -75,8 +80,13 @@ public class DbUserCommentServiceImpl implements IDbUserCommentService {
      * 新增用户评论
      */
     @Override
-    public Boolean insertByBo(DbUserCommentBo bo) {
+    public Boolean insertByBo(DbUserCommentBo bo, LoginUser loginUser) {
         DbUserComment add = BeanUtil.toBean(bo, DbUserComment.class);
+        DbWxUserVo user = wxUserMapper.selectVoById(bo.getUserId());
+        if(ObjectUtils.isNotEmpty(user)){
+            add.setUserHead(user.getHeadImgUrl());
+            add.setUserId(bo.getUserId());
+        }
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {

yongqi-xinrenli/src/main/resources/mapper/DbCouponMapper.xml

@@ -17,5 +17,22 @@
         <result property="modifyTime" column="modify_time"/>
         <result property="deleteStatus" column="delete_status"/>
     </resultMap>
-
+    <resultMap type="com.yongqi.xinrenli.domain.vo.DbCouponVo" id="DbCouponVoResult">
+        <result property="id" column="id"/>
+        <result property="couponType" column="coupon_type"/>
+        <result property="fullSubtraction" column="full_subtraction"/>
+        <result property="minUsed" column="min_used"/>
+        <result property="effectiveTime" column="effective_time"/>
+        <result property="failureTime" column="failure_time"/>
+        <result property="createUser" column="create_user"/>
+        <result property="modifyUser" column="modify_user"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="deleteStatus" column="delete_status"/>
+    </resultMap>
+    <select id="selectVoPageList" resultMap="DbCouponVoResult">
+            select * from db_coupon ${ew.getCustomSqlSegment}
+    </select>
+    <select id="selectVoByIds" resultMap="DbCouponVoResult" parameterType="java.lang.Long">
+        select * from db_coupon where id=#{id}
+    </select>
 </mapper>

yongqi-xinrenli/src/main/resources/mapper/DbOrderMapper.xml

@@ -81,7 +81,7 @@
         modify_time=now()
         where id = #{id}
     </update>
-    <select id="reportForms" resultType="com.yongqi.xinrenli.domain.vo.ReportFormsVo">
+    <select id="reportFormsExl" resultType="com.yongqi.xinrenli.domain.vo.ReportFormsVo">
         SELECT
                 ( SELECT count(*) FROM db_order WHERE `status` = '4' ) AS accomplish,
                 ( SELECT count(*) FROM db_order WHERE `status` = '2' ) AS reject,
@@ -106,6 +106,17 @@
             ) t
 
     </select>
+    <select id="reportForms" resultType="com.yongqi.xinrenli.domain.vo.ReportFormsVo">
+        SELECT
+                ( SELECT count(*) FROM db_order WHERE `status` = '4' ) AS accomplish,
+                ( SELECT count(*) FROM db_order WHERE `status` = '2' ) AS reject,
+                ( SELECT count(*) FROM db_order WHERE `status` = '6' ) AS refund,
+                ( SELECT TRUNCATE ( SUM( actual_amount )/ 10000, 2 ) FROM db_order WHERE `status` = '4' ) AS totalMoney,
+                (SELECT count(*) AS w FROM db_order WHERE `status` IN ( 2, 6 )) AS NoAccomplish ,
+                (( SELECT count(*) FROM db_order WHERE `status` = '4' )+(SELECT count(*) AS w FROM db_order WHERE `status` IN ( 2, 6 ))) as sum
+        FROM
+            DUAL
+    </select>
     <update id="unpaidJob" >
         update db_order set status='2',modify_time=NOW() where  status=3 and modify_time&lt;=DATE_SUB(SYSDATE(),INTERVAL 1 hour)
     </update>

yongqi-xinrenli/src/main/resources/mapper/DbUserCommentMapper.xml

@@ -9,12 +9,23 @@
         <result property="articleId" column="article_id"/>
         <result property="userId" column="user_id"/>
         <result property="content" column="content"/>
-        <result property="createUser" column="create_user"/>
-        <result property="createTime" column="create_time"/>
         <result property="modifyUser" column="modify_user"/>
         <result property="modifyTime" column="modify_time"/>
         <result property="deleteStatus" column="delete_status"/>
     </resultMap>
 
+    <resultMap type="com.yongqi.xinrenli.domain.vo.DbUserCommentVo" id="DbUserCommentVoResult">
+        <result property="id" column="id"/>
+        <result property="articleId" column="article_id"/>
+        <result property="userId" column="user_id"/>
+        <result property="content" column="content"/>
+        <result property="modifyUser" column="modify_user"/>
+        <result property="modifyTime" column="modify_time"/>
+        <result property="deleteStatus" column="delete_status"/>
+        <result property="userName" column="userName"/>
+    </resultMap>
 
+    <select id="selectUserPage" resultMap="DbUserCommentVoResult">
+        select c.*,w.nickname as userName from db_user_comment c INNER JOIN db_wx_user w on c.user_id=w.id ${ew.getCustomSqlSegment}
+    </select>
 </mapper>

yongqi-xinrenli/src/main/resources/mapper/DbUserCouponMapper.xml

@@ -13,6 +13,7 @@
         <result property="modifyTime" column="modify_time"/>
     </resultMap>
     <resultMap type="com.yongqi.xinrenli.domain.vo.DbCouponVo" id="DbCouponResult">
+        <result property="id" column="id"/>
         <result property="couponType" column="coupon_type"/>
         <result property="fullSubtraction" column="full_subtraction"/>
         <result property="minUsed" column="min_used"/>
@@ -23,6 +24,7 @@
     </resultMap>
     <select id="selectListPage" resultMap="DbCouponResult">
         SELECT
+            c.id,
             c.coupon_type,
             c.full_subtraction,
             min_used,