Merge branch 'refs/heads/dev' into test

share-front/src/main/java/share/web/controller/system/DurationLogController.java

@@ -21,7 +21,7 @@ import java.util.List;
  * @date 2024-06-24
  */
 @RestController
-@RequestMapping("/system/durationLog")
+@RequestMapping("/durationLog")
 public class DurationLogController extends BaseController {
     @Autowired
     private DurationLogService durationLogService;

share-front/src/main/java/share/web/controller/system/EquityMembersOrderController.java

@@ -12,6 +12,7 @@ import share.common.core.domain.R;
 import share.common.core.page.TableDataInfo;
 import share.common.core.redis.RedisUtil;
 import share.common.enums.BusinessType;
+import share.common.enums.YesNoEnum;
 import share.common.utils.JsonConvertUtil;
 import share.system.domain.SConsumer;
 import share.system.domain.vo.EquityMembersOrderVo;
@@ -45,6 +46,7 @@ public class EquityMembersOrderController extends BaseController {
         startPage();
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         equityMembersOrder.setConsumerId(user.getId());
+        equityMembersOrder.setPayStatus(YesNoEnum.yes.getIndex());
         List<EquityMembersOrderVo> list = equityMembersOrderService.selectEquityMembersOrderList(equityMembersOrder);
         return getDataTable(list);
     }

share-front/src/main/java/share/web/controller/system/RechargeController.java

@@ -10,6 +10,7 @@ import share.common.core.domain.AjaxResult;
 import share.common.core.domain.R;
 import share.common.core.page.TableDataInfo;
 import share.common.core.redis.RedisUtil;
+import share.common.enums.YesNoEnum;
 import share.common.utils.JsonConvertUtil;
 import share.system.domain.SConsumer;
 import share.system.domain.vo.FrontTokenComponent;
@@ -43,6 +44,7 @@ public class RechargeController extends BaseController {
         startPage();
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         recharge.setConsumerId(user.getId());
+        recharge.setStatus(YesNoEnum.yes.getIndex());
         List<RechargeVo> list = rechargeService.selectRechargeList(recharge);
         return getDataTable(list);
     }

share-system/src/main/java/share/system/response/ComputedOrderPriceResponse.java

@@ -42,6 +42,9 @@ public class ComputedOrderPriceResponse implements Serializable {
     @ApiModelProperty(value = "折扣比例")
     private BigDecimal discountRatio;
 
+    @ApiModelProperty(value = "可用时长")
+    private BigDecimal availableDuration;
+
     //使用时长
     @ApiModelProperty(value = "使用时长")
     private BigDecimal duration;
@@ -50,6 +53,9 @@ public class ComputedOrderPriceResponse implements Serializable {
     @ApiModelProperty(value = "剩余时长")
     private BigDecimal remainingDuration;
 
+    @ApiModelProperty(value = "可用余额")
+    private BigDecimal availableBalance;
+
     //使用余额
     @ApiModelProperty(value = "使用余额")
     private BigDecimal balance;

share-system/src/main/resources/mapper/system/BalanceLogMapper.xml

@@ -67,6 +67,7 @@
             <if test="operationTime != null ">and b.operation_time = #{operationTime}</if>
             <if test="isDelete != null ">and b.is_delete = #{isDelete}</if>
         </where>
+        ORDER BY b.operation_time DESC
     </select>
 
     <select id="selectBalanceLogById" parameterType="Long" resultMap="BalanceLogResult">

share-system/src/main/resources/mapper/system/DurationLogMapper.xml

@@ -67,6 +67,7 @@
             <if test="operationTime != null ">and d.operation_time = #{operationTime}</if>
             <if test="isDelete != null ">and d.is_delete = #{isDelete}</if>
         </where>
+        ORDER BY d.operation_time DESC
     </select>
 
     <select id="selectDurationLogById" parameterType="Long" resultMap="DurationLogResult">

share-system/src/main/resources/mapper/system/IntegralLogMapper.xml

@@ -67,6 +67,7 @@
             <if test="operationTime != null ">and i.operation_time = #{operationTime}</if>
             <if test="isDelete != null ">and i.is_delete = #{isDelete}</if>
         </where>
+        ORDER BY i.operation_time DESC
     </select>
 
     <select id="selectIntegralLogById" parameterType="Long" resultMap="IntegralLogResult">

share-system/src/main/resources/mapper/system/MemberProgressLogMapper.xml

@@ -70,6 +70,7 @@
             <if test="operationTime != null ">and m.operation_time = #{operationTime}</if>
             <if test="isDelete != null ">and m.is_delete = #{isDelete}</if>
         </where>
+        ORDER BY m.operation_time DESC
     </select>
 
     <select id="selectMemberProgressLogById" parameterType="Long" resultMap="MemberProgressLogResult">