商家结算卡信息

ruoyi-admin/src/main/java/com/ruoyi/web/controller/shop/business/BusinessController.java

@@ -379,4 +379,13 @@ public class BusinessController extends BaseController {
         bo.setParentBusinessId(getBusinessId(true));
         return R.ok(iBusinessService.querySlimList(bo));
     }
+
+    @FilePathSplicing(type = FilePathSplicingType.RESPONSE)
+    @ApiOperation("获取二维码")
+    @PostMapping("/getQrCode/{id}")
+    public R<String> getQrCode(@ApiParam("主键")
+                               @NotNull(message = "主键不能为空")
+                               @PathVariable("id") Long id) {
+        return R.ok("成功", iBusinessService.getQrCode(id));
+    }
 }

ruoyi-admin/src/main/resources/application-dev.yml

@@ -273,4 +273,4 @@ fubei:
     callbackUrl: https://frp.songlanyun.com/api/wx/fuRefund/notify
 
 business:
-  qrUrl: https://yourdomain.com/universal_qr
+  qrUrl: https://shop.xiaocaituan.com

ruoyi-business/src/main/java/com/ruoyi/business/service/IBusinessService.java

@@ -157,4 +157,6 @@ public interface IBusinessService {
     String loadCustomerServicePhone(Long businessId);
 
     Long queryParentBusinessIdById(Long businessId);
+
+    String getQrCode(Long id);
 }

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessApplyServiceImpl.java

@@ -132,6 +132,7 @@ public class BusinessApplyServiceImpl implements IBusinessApplyService {
         lqw.eq(bo.getAgentAuditUserId() != null, BusinessApply::getAgentAuditUserId, bo.getAgentAuditUserId());
         lqw.eq(bo.getAgentAuditStatus() != null, BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatus());
         lqw.in(CollUtil.isNotEmpty(bo.getAgentAuditStatusList()), BusinessApply::getAgentAuditStatus, bo.getAgentAuditStatusList());
+        lqw.like(StringUtils.isNotBlank(bo.getLegalName()), BusinessApply::getLegalName, bo.getLegalName());
         Date startTime = bo.getStartTime();
         if (ObjectUtil.isNotNull(startTime)) {
             lqw.ge(BusinessApply::getCreateTime, DateUtil.beginOfDay(startTime));
@@ -269,13 +270,13 @@ public class BusinessApplyServiceImpl implements IBusinessApplyService {
         if (!AuditStatus.AUDIT_PASS.getCode().equals(businessApply.getAgentAuditStatus())) {
             throw new ServiceException(BusinessApplyExceptionEnum.AGENT_NOT_AUDIT_PASS);
         }
-        AgentAccountCodeVo agentAccountCodeVo = agentAccountCodeService.availableByAccountCode(businessApply.getAccountCode());
-        if (ObjectUtil.isNull(agentAccountCodeVo)) {
-            throw new ServiceException(BusinessApplyExceptionEnum.ACCOUNT_CODE_NOT_EXISTS);
-        }
-        Agent agent = agentService.loadById(agentAccountCodeVo.getAgentId(), true);
         Long businessId = businessService.queryIdByUserId(businessApply.getUserId());
         if (AuditStatus.AUDIT_PASS.getCode().equals(bo.getAuditStatus())) {
+            AgentAccountCodeVo agentAccountCodeVo = agentAccountCodeService.availableByAccountCode(businessApply.getAccountCode());
+            if (ObjectUtil.isNull(agentAccountCodeVo)) {
+                throw new ServiceException(BusinessApplyExceptionEnum.ACCOUNT_CODE_NOT_EXISTS);
+            }
+            Agent agent = agentService.loadById(agentAccountCodeVo.getAgentId(), true);
             //通过
             BusinessBo businessBo = BeanCopyUtils.copy(businessApply, BusinessBo.class);
             businessBo.setBusinessId(businessId);

ruoyi-business/src/main/java/com/ruoyi/business/service/impl/BusinessServiceImpl.java

@@ -751,4 +751,15 @@ public class BusinessServiceImpl implements IBusinessService {
         return ObjectUtil.isNotNull(business) ? business.getParentBusinessId() : null;
     }
 
+    @Override
+    public String getQrCode(Long id) {
+        Business business = loadById(id, true);
+        if (business.getQrCode() != null) {
+            return business.getQrCode();
+        }
+        business.setQrCode(generateQr(business.getInviteCode()));
+        baseMapper.updateById(business);
+        return business.getQrCode();
+    }
+
 }

ruoyi-user/src/main/java/com/ruoyi/user/domain/bo/UserOpinionBo.java

@@ -105,5 +105,7 @@ public class UserOpinionBo extends BaseEntity {
     @ApiModelProperty(value = "处理结果", required = true)
     private String operateContent;
 
+    private Date submitStartTime;
+    private Date submitEndTime;
 
 }

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserOpinionServiceImpl.java

@@ -78,6 +78,8 @@ public class UserOpinionServiceImpl implements IUserOpinionService {
         lqw.like(StringUtils.isNotBlank(bo.getOperateUserName()), UserOpinion::getOperateUserName, bo.getOperateUserName());
         lqw.eq(bo.getOperateTime() != null, UserOpinion::getOperateTime, bo.getOperateTime());
         lqw.eq(StringUtils.isNotBlank(bo.getOperateContent()), UserOpinion::getOperateContent, bo.getOperateContent());
+        lqw.ge(bo.getSubmitStartTime() != null, UserOpinion::getSubmitTime, bo.getSubmitStartTime());
+        lqw.le(bo.getSubmitEndTime() != null, UserOpinion::getSubmitTime, bo.getSubmitEndTime());
         lqw.orderByDesc(UserOpinion::getSubmitTime);
         return lqw;
     }

ruoyi-user/src/main/java/com/ruoyi/user/service/impl/UserServiceImpl.java

@@ -174,6 +174,7 @@ public class UserServiceImpl implements IUserService {
         lqw.ge(ObjectUtil.isNotNull(bo.getCreateDayStart()), User::getCreateTime, bo.getCreateDayStart());
         lqw.le(ObjectUtil.isNotNull(bo.getCreateDayEnd()), User::getCreateTime, bo.getCreateDayEnd());
         lqw.eq(ObjectUtil.isNotNull(bo.getParentUserId()), User::getParentUserId, bo.getParentUserId());
+        lqw.orderByDesc(User::getCreateTime);
         return lqw;
     }
 
@@ -796,13 +797,18 @@ public class UserServiceImpl implements IUserService {
     @Override
     public UserStatisticsVo statistics(UserBo bo) {
         UserStatisticsVo statistics = baseMapper.statistics(bo);
+        if (ObjectUtil.isNull(statistics)) {
+            return statistics;
+        }
         statistics.setAvailableBalance(baseMapper.queryAvailableBalance(bo));
         //剩余排队金额
         statistics.setSurplusQueueMoney(baseMapper.querySurplusQueueMoney(bo));
         //累计补贴金额
         UserStatisticsVo subsidyMoney = baseMapper.querySubsidyMoney(bo);
-        statistics.setShouldSubsidyMoney(subsidyMoney.getShouldSubsidyMoney());
-        statistics.setAlreadySubsidyMoney(subsidyMoney.getAlreadySubsidyMoney());
+        if (ObjectUtil.isNotNull(subsidyMoney)) {
+            statistics.setShouldSubsidyMoney(subsidyMoney.getShouldSubsidyMoney());
+            statistics.setAlreadySubsidyMoney(subsidyMoney.getAlreadySubsidyMoney());
+        }
         return statistics;
     }
 

ruoyi-user/src/main/resources/mapper/user/UserMapper.xml

@@ -97,7 +97,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="queryAvailableBalance" resultType="java.math.BigDecimal">
         select sum(u.balance) from tb_user u
-        <include refid="whereByStatis"/>
+        <where>
+            <include refid="whereByStatis"/>
+        </where>
     </select>
 
     <select id="statistics" resultType="com.ruoyi.user.domain.vo.UserStatisticsVo">
@@ -109,8 +111,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="bo.id == null">
             join tb_user u on u.id = ub.user_id
         </if>
-        <include refid="whereByStatis"/>
         <where>
+            <include refid="whereByStatis"/>
             <if test="bo.id != null">
                 and ub.user_id = #{bo.id}
             </if>
@@ -148,8 +150,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="bo.businessId != null">
                 and tsq.current_business_id = #{bo.businessId}
             </if>
+            <include refid="whereByStatis"/>
         </where>
-        <include refid="whereByStatis"/>
     </select>
 
     <select id="selectBusinessPage" resultType="com.ruoyi.user.domain.vo.UserVo">
@@ -175,19 +177,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <sql id="whereByStatis">
-        <where>
-            <if test="bo.mobile != null and bo.mobile != ''">
-                and u.mobile like concat('%',#{bo.mobile},'%')
-            </if>
-            <if test="bo.nickname != null and bo.nickname != ''">
-                and u.nickname like concat('%',#{bo.nickname},'%')
-            </if>
-            <if test="bo.createDayStart != null">
-                and u.create_day &gt;= #{bo.createDayStart}
-            </if>
-            <if test="bo.createDayEnd != null">
-                and u.create_day &lt;= #{bo.createDayEnd}
-            </if>
-        </where>
+        <if test="bo.mobile != null and bo.mobile != ''">
+            and u.mobile like concat('%',#{bo.mobile},'%')
+        </if>
+        <if test="bo.nickname != null and bo.nickname != ''">
+            and u.nickname like concat('%',#{bo.nickname},'%')
+        </if>
+        <if test="bo.createDayStart != null">
+            and u.create_day &gt;= #{bo.createDayStart}
+        </if>
+        <if test="bo.createDayEnd != null">
+            and u.create_day &lt;= #{bo.createDayEnd}
+        </if>
     </sql>
 </mapper>