bug修复

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

@@ -261,6 +261,7 @@ jzq:
   organizationCreate: /v2/user/organizationCreate
   cloudCertiPerInfo: /v2/user/cloudCertiPerInfo
   tmplPre: /v2/tmpl/pre
+  organizationReapply: /v2/user/organizationReapply
 
 fubei:
   appId: 6927ab8bbdaa24db3fb4f511

ruoyi-base/src/main/java/com/ruoyi/base/platform/service/impl/PlatformInfoServiceImpl.java

@@ -213,7 +213,7 @@ public class PlatformInfoServiceImpl implements IPlatformInfoService {
         params.put("organizationRegImg",filePathSplicingUtil.getPrefix() + info.getBusinessLicenseImg());//营业执照图片
         params.put("legalName", info.getLegalPersonName());//法人姓名
         params.put("legalIdentityCard", info.getIdCardNumber());//法人身份证号
-        String email = jzqService.organizationCreate(params);
+        String email = jzqService.organizationCreate(params, info.getEmail());
         if (StringUtils.isNotEmpty(email)) {
             PlatformInfo update = new PlatformInfo();
             update.setId(info.getId());

ruoyi-business/src/main/java/com/ruoyi/business/domain/vo/BusinessVo.java

@@ -284,8 +284,6 @@ public class BusinessVo extends BaseVo {
     /**
      * 营业状态(0停业，1正常)
      */
-    @ExcelProperty(value = "营业状态", converter = ExcelBooleanConvert.class)
-    @ExcelDictFormat(readConverterExp = "true=正常,false=停业")
     @ApiModelProperty("营业状态(0停业，1正常)")
     private Boolean businessStatus;
 
@@ -361,6 +359,8 @@ public class BusinessVo extends BaseVo {
     /**
      * 是否闭店
      */
+    @ExcelProperty(value = "状态", converter = ExcelBooleanConvert.class)
+    @ExcelDictFormat(readConverterExp="true=关闭,false=正常")
     @ApiModelProperty(value = "是否闭店")
     private Boolean closeStatus;
 

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

@@ -180,7 +180,7 @@ public class BusinessServiceImpl implements IBusinessService {
     private LambdaQueryWrapper<Business> buildQueryWrapper(BusinessBo bo) {
         Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<Business> lqw = Wrappers.lambdaQuery();
-        lqw.eq(bo.getBusinessId() != null, Business::getBusinessId, bo.getBusinessId());
+        lqw.like(bo.getBusinessId() != null, Business::getBusinessId, bo.getBusinessId());
         lqw.eq(bo.getAgentId() != null, Business::getAgentId, bo.getAgentId());
         lqw.like(StringUtils.isNotBlank(bo.getLegalName()), Business::getLegalName, bo.getLegalName());
         lqw.eq(bo.getBusinessType() != null, Business::getBusinessType, bo.getBusinessType());

ruoyi-line/src/main/java/com/ruoyi/onlineorder/domain/vo/OnlineOrderVo.java

@@ -46,14 +46,14 @@ public class OnlineOrderVo extends BaseVo {
     /**
      * 所属商家名称
      */
-    @ExcelProperty(value = "所属商家名称")
+    @ExcelProperty(value = "到店店铺")
     @ApiModelProperty("所属商家名称")
     private String businessName;
 
     /**
      * 订单编号
      */
-    @ExcelProperty(value = "订单编号")
+    @ExcelProperty(value = "订单号")
     @ApiModelProperty("订单编号")
     private String orderNo;
 
@@ -74,7 +74,6 @@ public class OnlineOrderVo extends BaseVo {
     /**
      * 订单下单用户用户名称
      */
-    @ExcelProperty(value = "用户名称")
     @ApiModelProperty("订单下单用户用户名称")
     private String userName;
 
@@ -111,7 +110,7 @@ public class OnlineOrderVo extends BaseVo {
     /**
      * 退款金额
      */
-    @ExcelProperty(value = "退款金额")
+    @ExcelProperty(value = "已退金额")
     @ApiModelProperty(value = "退款金额")
     private BigDecimal refundAmount;
 
@@ -130,19 +129,12 @@ public class OnlineOrderVo extends BaseVo {
     @ApiModelProperty(value = "订单补贴金额", required = true)
     private BigDecimal subsidyAmount;
 
-
-
-
     /**
      * 订单金额
      */
-    @ExcelProperty(value = "订单金额")
     @ApiModelProperty("订单金额")
     private BigDecimal orderAmount;
 
-
-
-
     /**
      * 订单支付状态(0:未支付,5:已支付,10支付失败)
      */
@@ -178,15 +170,12 @@ public class OnlineOrderVo extends BaseVo {
     /**
      * 订单取消方式(0:未取消,1:用户取消,2:支付过期取消,3:商家取消)
      */
-    @ExcelProperty(value = "订单取消方式", converter = ExcelEnumConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=未取消,1=用户取消,2=支付过期取消,3=商家取消")
     @ApiModelProperty("订单取消方式(0:未取消,1:用户取消,2:支付过期取消,3:商家取消)")
     private OnlineOrderCancelType cancelType;
 
     /**
      * 订单取消时间
      */
-    @ExcelProperty(value = "订单取消时间",converter = ExcelDateTimeConvert.class)
     @ApiModelProperty("订单取消时间")
     private Date cancelTime;
 
@@ -201,8 +190,6 @@ public class OnlineOrderVo extends BaseVo {
     /**
      * 订单退款状态(0:未退款,1:退款中,2:已退款)
      */
-    @ExcelProperty(value = "订单退款状态", converter = ExcelEnumConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=未退款,1=退款中,2=已退款")
     @ApiModelProperty("订单退款状态(0:未退款,1:退款中,2:已退款)")
     private OnlineOrderRefundStatus refundStatus;
 
@@ -211,7 +198,6 @@ public class OnlineOrderVo extends BaseVo {
     /**
      * 已送积分
      */
-    @ExcelProperty(value = "已送积分")
     @ApiModelProperty("已送积分")
     private BigDecimal sendPoint;
 
@@ -228,8 +214,6 @@ public class OnlineOrderVo extends BaseVo {
 
 
     @ApiModelProperty(value = "是否封单")
-    @ExcelProperty(value = "是否封单")
-    @ExcelDictFormat(readConverterExp = "true=是,false=否")
     private Boolean end;
 
 
@@ -237,19 +221,15 @@ public class OnlineOrderVo extends BaseVo {
      * 商家所得
      */
     @ApiModelProperty(value = "商家所得")
-    @ExcelProperty(value = "商家所得")
     private BigDecimal businessIncome;
 
     /**
      * 商家让利
      */
     @ApiModelProperty(value = "商家让利")
-    @ExcelProperty(value = "商家让利")
     private BigDecimal businessShouldSubsidy;
 
 
-    @ExcelProperty(value = "补贴状态", converter = ExcelEnumConvert.class)
-    @ExcelDictFormat(readConverterExp = "0=排队中,1=补贴完成")
     @ApiModelProperty(value = "补贴状态(0:排队中,1:补贴完成)")
     private SubsidyStatus subsidyStatus;
 
@@ -257,20 +237,17 @@ public class OnlineOrderVo extends BaseVo {
      * 平台服务费
      */
     @ApiModelProperty(value = "平台服务费")
-    @ExcelProperty(value = "平台服务费")
     private BigDecimal platformServiceFee;
     /**
      * 平台所得
      */
     @ApiModelProperty(value = "平台所得")
-    @ExcelProperty(value = "平台所得")
     private BigDecimal platformIncome;
 
     /**
      * 平台所得是否已分账
      */
     @ApiModelProperty(value = "平台所得是否已分账")
-    @ExcelProperty(value = "平台所得是否已分账")
     private CallInterfaceStatus platformIncomeSettled;
 
 

ruoyi-line/src/main/java/com/ruoyi/onlineorder/service/impl/OnlineOrderServiceImpl.java

@@ -344,15 +344,32 @@ public class OnlineOrderServiceImpl implements IOnlineOrderService {
 
     @Override
     public TableDataInfo<OnlineOrderVo> queryCustomPageList(OnlineOrderBo bo, PageQuery pageQuery) {
+        buildTime(bo);
         Page<OnlineOrderVo> result = baseMapper.queryCustomPageList(pageQuery.build(), bo);
         return TableDataInfo.build(result);
     }
 
     @Override
     public List<OnlineOrderVo> queryCustomList(OnlineOrderBo bo) {
+        buildTime(bo);
         return baseMapper.queryCustomList(bo);
     }
 
+    private void buildTime(OnlineOrderBo bo) {
+        if (ObjectUtil.isNotNull(bo.getPayStartTime())) {
+            bo.setPayStartTime(DateUtil.beginOfDay(bo.getPayStartTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getPayEndTime())) {
+            bo.setPayEndTime(DateUtil.endOfDay(bo.getPayEndTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getRefundStartTime())) {
+            bo.setRefundStartTime(DateUtil.beginOfDay(bo.getRefundStartTime()));
+        }
+        if (ObjectUtil.isNotNull(bo.getRefundEndTime())) {
+            bo.setRefundEndTime(DateUtil.endOfDay(bo.getRefundEndTime()));
+        }
+    }
+
     @Override
     public PayVo thirdPay(OnlineOrderBo bo, Long userId) {
         OnlineOrder onlineOrder = loadById(bo.getOrderId(), true);
@@ -375,6 +392,7 @@ public class OnlineOrderServiceImpl implements IOnlineOrderService {
 
     @Override
     public OnlineOrderCountVo getStatistics(OnlineOrderBo bo) {
+        buildTime(bo);
         return baseMapper.getStatistics(bo);
     }
 

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -157,7 +157,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
         LambdaQueryWrapper<SubsidyQueue> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getUserId() != null, SubsidyQueue::getUserId, bo.getUserId());
         lqw.eq(bo.getCurrentBusinessId() != null, SubsidyQueue::getCurrentBusinessId, bo.getCurrentBusinessId());
-        lqw.eq(StringUtils.isNotBlank(bo.getOrderNo()), SubsidyQueue::getOrderNo, bo.getOrderNo());
+        lqw.like(StringUtils.isNotBlank(bo.getOrderNo()), SubsidyQueue::getOrderNo, bo.getOrderNo());
         lqw.like(StringUtils.isNotBlank(bo.getUserName()), SubsidyQueue::getUserName, bo.getUserName());
         lqw.like(StringUtils.isNotBlank(bo.getUserMobile()), SubsidyQueue::getUserMobile, bo.getUserMobile());
 
@@ -193,12 +193,11 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
         if (ObjectUtil.isNotNull(bo.getQueueEndTime())) {
             lqw.le(SubsidyQueue::getQueueTime, bo.getQueueEndTime());
         }
-
         if (ObjectUtil.isNotNull(bo.getMoveStartTime())) {
-            lqw.ge(SubsidyQueue::getMoveTime, bo.getMoveStartTime());
+            lqw.ge(SubsidyQueue::getMoveTime, DateUtil.beginOfDay(bo.getMoveStartTime()));
         }
         if (ObjectUtil.isNotNull(bo.getMoveEndTime())) {
-            lqw.le(SubsidyQueue::getMoveTime, bo.getMoveEndTime());
+            lqw.le(SubsidyQueue::getMoveTime, DateUtil.endOfDay(bo.getMoveEndTime()));
         }
 
 

ruoyi-line/src/main/resources/mapper/onlineorder/OnlineOrderMapper.xml

@@ -79,6 +79,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                     #{item}
                 </foreach>
             </if>
+            <if test="bo.userMobile != null and bo.userMobile!=''">
+                and too.user_mobile like concat('%',#{bo.userMobile},'%')
+            </if>
         </where>
     </sql>
     <sql id="listsql">

ruoyi-shop/src/main/java/com/ruoyi/shop/business/domain/vo/BusinessIntegralVo.java

@@ -4,7 +4,7 @@ import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.ruoyi.business.enums.BusinessType;
 import com.ruoyi.common.annotation.ExcelDictFormat;
-import com.ruoyi.common.convert.ExcelDictConvert;
+import com.ruoyi.common.convert.ExcelEnumConvert;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -29,30 +29,36 @@ public class BusinessIntegralVo {
     /**
      * 店铺名称
      */
+    @ExcelProperty(value = "店铺名称")
     @ApiModelProperty(value = "店铺名称")
     private String businessName;
 
     /**
      * 店铺类型
      */
+    @ExcelProperty(value = "商家类型", converter = ExcelEnumConvert.class)
+    @ExcelDictFormat(readConverterExp = "1=普通店铺,2=总店商家,3=分店商家")
     @ApiModelProperty(value = "店铺类型")
     private BusinessType businessType;
 
     /**
      * 累计发放积分
      */
+    @ExcelProperty(value = "累计发放积分")
     @ApiModelProperty(value = "累计发放积分")
     private BigDecimal totalGrantIntegral;
 
     /**
      * 已使用积分
      */
+    @ExcelProperty(value = "已使用积分")
     @ApiModelProperty(value = "已使用积分")
     private BigDecimal usedIntegral;
 
     /**
      * 待使用积分
      */
+    @ExcelProperty(value = "待使用积分")
     @ApiModelProperty(value = "待使用积分")
     private BigDecimal waitUseIntegral;
 }

ruoyi-tool/src/main/java/com/ruoyi/tool/config/JzqProperties.java

@@ -57,4 +57,8 @@ public class JzqProperties {
      * 合同模版预览
      */
     private String tmplPre;
+    /**
+     * 企业实名认证修改
+     */
+    private String organizationReapply;
 }

ruoyi-tool/src/main/java/com/ruoyi/tool/service/JzqService.java

@@ -155,12 +155,17 @@ public class JzqService {
         return response;
     }
 
-    public String organizationCreate(Map<String, Object> params) {
+    public String organizationCreate(Map<String, Object> params, String email) {
         RequestUtils requestUtils = RequestUtils.init(jzqProperties.getBaseUrl(), jzqProperties.getAppKey(), jzqProperties.getAppSecret());
         ResultInfo<String> ri = requestUtils.doPost(jzqProperties.getOrganizationCreate(), params);
         log.info("企业实名认证上传：{}", ri.getMsg());
         if (ri.isSuccess()) {
             return ri.getData();
+        } else if ("ACCOUNT_CONFFLICT".equals(ri.getResultCode())) {
+            //修改信息
+            params.put("emailOrMobile", email);
+            ResultInfo<Object> resultInfo = requestUtils.doPost(jzqProperties.getOrganizationReapply(), params);
+            log.info("企业实名修改信息：{}", resultInfo.getMsg());
         }
         return null;
     }