ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/miniapp/AppIntegralController.java
@@ -89,9 +89,9 @@ integralChangeDto.setIntegralType(1); integralChangeDto.setUserId(userId); Boolean complete = memberService.changeIntegral(integralChangeDto); // if (complete) { // throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK); // } if (complete) { throw new ServiceException(AppErrorConstant.DOUBLE_INTEGRAL_TASK); } //判断是否可以抽奖 List<TLotteryEvent> data = lotteryEventClient.getLotteryEventList(3).getData(); Map<String, Object> map = new HashMap<>(); ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MgtThirdOrderPageDto.java
@@ -17,21 +17,21 @@ private Long shopId; @ApiModelProperty(value = "下单时间-范围开始") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeBegin; // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String createTimeBegin; @ApiModelProperty(value = "下单时间-范围结束") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTimeEnd; // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String createTimeEnd; @ApiModelProperty(value = "订单来源5.美团6.抖音7.快手8.小鹅云") private Integer orderFrom; private String orderFrom; @ApiModelProperty(value = "核销时间-范围开始") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime useTimeBegin; // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String useTimeBegin; @ApiModelProperty(value = "核销时间-范围结束") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime useTimeEnd; // @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private String useTimeEnd; @ApiModelProperty(value = "keyword转换用户ids",hidden = true) ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -4046,6 +4046,12 @@ mgtOrderTotal.setActivityOrderMoneyTotal(mgtOrderTotalThird.getActivityOrderMoneyTotal()); mgtOrderTotal.setActivityPayMoneyTotal(mgtOrderTotalThird.getActivityPayMoneyTotal()); mgtOrderTotal.setActivityUnPayMoneyTotal(mgtOrderTotalThird.getActivityOrderMoneyTotal().subtract(mgtOrderTotalThird.getActivityPayMoneyTotal())); mgtOrderTotal.setThirdOrderTotal(mgtOrderTotalFour.getThirdOrderTotal()); mgtOrderTotal.setThirdOrderMoneyTotal(mgtOrderTotalFour.getThirdOrderMoneyTotal()); mgtOrderTotal.setThirdPayMoneyTotal(mgtOrderTotalFour.getThirdPayMoneyTotal()); mgtOrderTotal.setThirdUnPayMoneyTotal(mgtOrderTotalFour.getThirdOrderMoneyTotal().subtract(mgtOrderTotalFour.getThirdPayMoneyTotal())); return mgtOrderTotal; } @@ -4432,7 +4438,7 @@ */ private List<MgtMapBigTotalVo> bigListRemoveNull(List<MgtMapBigTotalVo> MgtMapIntTotalVos) { for (int i = 0; i < MgtMapIntTotalVos.size(); i++) { if(null != MgtMapIntTotalVos.get(i).getMapKey() && MgtMapIntTotalVos.get(i).getMapKey().isEmpty()){ if(null == MgtMapIntTotalVos.get(i).getMapKey() || MgtMapIntTotalVos.get(i).getMapKey().isEmpty()){ MgtMapIntTotalVos.remove(i); } } ruoyi-modules/ruoyi-order/src/main/resources/mapper/order/OrderMapper.xml
@@ -1302,7 +1302,12 @@ <select id="listPlTotalOrderTotalGoodsRank" resultType="com.ruoyi.system.api.domain.vo.MgtMapBigTotalVo"> SELECT tog.goods_name mapKey, IFNULL(SUM(tog.goods_receivable_money),0) mapValue IFNULL(SUM( CASE WHEN toc.order_from IN (5, 6, 7) THEN toc.receivable_money ELSE tog.goods_receivable_money END ), 0) AS mapValue FROM t_order toc INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id WHERE toc.del_flag = 0 AND order_status = 3 @@ -1328,6 +1333,7 @@ WHEN 1 THEN "商城订单" WHEN 2 THEN "秒杀订单" WHEN 3 THEN "线下订单" WHEN 4 then "抽奖订单" END mapKey, IFNULL(SUM(CASE WHEN pay_type = 1 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) WHEN pay_type = 2 THEN (CASE WHEN null = change_receivable_money or change_receivable_money = 0 THEN receivable_money ELSE change_receivable_money END) + online_pay_money ELSE 0 END),0) mapValue FROM t_order toc @@ -2221,10 +2227,6 @@ SELECT toc.order_no orderNo, CASE toc.order_from WHEN 1 THEN '小程序' WHEN 2 THEN '秒杀活动' WHEN 3 THEN '线下创建' WHEN 4 THEN '抽奖' WHEN 5 THEN '美团' WHEN 6 THEN '抖音' WHEN 7 THEN '快手' @@ -2236,7 +2238,14 @@ toc.use_time verifyTime FROM t_order toc INNER JOIN t_order_goods tog ON tog.order_id = toc.order_id WHERE toc.del_flag = 0 AND toc.order_from in (5,6,7) WHERE toc.del_flag = 0 <if test="param.orderFrom == null or param.orderFrom == '' "> and toc.order_from in (5,6,7) </if> <if test="null != param.orderFrom and param.orderFrom!='' "> and toc.order_from = #{param.orderFrom} </if> <if test="param.shopId != null and param.shopId != ''"> AND toc.shop_id = #{param.shopId} </if> @@ -2320,7 +2329,7 @@ <if test="param.keyword != null and param.keyword != ''"> AND (toc.order_no LIKE CONCAT('%',#{param.keyword},'%') OR toc.activity_name LIKE CONCAT('%',#{param.keyword},'%') OR FIND_IN_SET(toc.user_id, #{param.userIds}) > 0) </if> <if test="param.useTimeBegin != null and param.useTimeBegin != ''"> <if test="param.verifyStartTime != null and param.verifyStartTime != ''"> AND Date(toc.use_time) >= #{param.verifyStartTime} </if> <if test="param.verifyEndTime != null and param.verifyEndTime != ''"> ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/dto/MgtEditShopDto.java
@@ -152,4 +152,8 @@ @ApiModelProperty("修改价格权限（0=关，1=开）") private Integer modifyPricePermission; @ApiModelProperty("抖音id") private String dyPoiId; @ApiModelProperty("快手id") private String ksPoiId; } ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtShopInfoVo.java
@@ -161,6 +161,11 @@ @ApiModelProperty("修改价格权限（0=关，1=开）") private Integer modifyPricePermission; @ApiModelProperty("抖音门店id") private String dyPoiId; @ApiModelProperty("快手门店id") private String ksPoiId; } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/config/OneClinkSyncingServiceImpl.java
@@ -44,10 +44,15 @@ @Override public IPage<MgtOneClinkSyncPageVO> pageOneClinkSyncing(MgtOneClinkSyncingPageDTO mgtPageDto) { if (null != mgtPageDto.getSyncingStartTime()){ LocalDateTime startTime = mgtPageDto.getSyncingStartTime().atStartOfDay(); LocalDateTime endTime = mgtPageDto.getSyncingEndTime().atTime(LocalTime.MAX); mgtPageDto.setStartTime(startTime); } if(null != mgtPageDto.getSyncingEndTime()){ LocalDateTime endTime = mgtPageDto.getSyncingEndTime().atTime(LocalTime.MAX); mgtPageDto.setEndTime(endTime); } //分页查询 IPage<MgtOneClinkSyncPageVO> page = new Page<>(mgtPageDto.getPageNum(),mgtPageDto.getPageSize());
@@ -20,10 +20,10 @@ <if test="null != dto.syncingName and ''!= dto.syncingName"> and syncing_name like concat('%',#{dto.syncingName},'%') </if> <if test="dto.startTime!=null and dto.startTime != ''"> <if test="dto.startTime!=null "> AND syncing_time >= #{dto.startTime} </if> <if test="dto.endTime!=null and dto.endTime != ''"> <if test="dto.endTime!=null "> AND syncing_time <= #{dto.endTime} </if> </select>
