Merge branch 'refs/heads/dev' into test

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

@@ -55,6 +55,7 @@ public class EquityMembersOrderController extends BaseController {
     public AjaxResult query(EquityMembersOrderVo equityMembersOrder) {
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         equityMembersOrder.setConsumerId(user.getId());
+        equityMembersOrder.setPayStatus(YesNoEnum.yes.getIndex());
         List<EquityMembersOrderVo> list = equityMembersOrderService.selectEquityMembersOrderList(equityMembersOrder);
         return success(list);
     }

share-system/src/main/java/share/system/service/impl/EquityMembersOrderServiceImpl.java

@@ -146,6 +146,7 @@ public class EquityMembersOrderServiceImpl extends ServiceImpl<EquityMembersOrde
             }
         }
         EquityMembersOrder equityMembersOrder = generatEquityMembersOrder(request, user);
+        equityMembersOrder.setCreateTime(new Date());
         save(equityMembersOrder);
         EquityMembersResultResponse response = orderPayService.saobeiEquityMembersOrderPayment(equityMembersOrder);
         return response;

share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java

@@ -138,6 +138,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             }
         }
         Recharge recharge = generatRecharge(request, user);
+        recharge.setCreateTime(new Date());
         save(recharge);
         RechargePayResultResponse response = orderPayService.saobeiRechargePayment(recharge);
         return response;

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1193,6 +1193,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 durationLog.setCurrentDuration(consumerWallet.getRemainingDuration());
                 durationLog.setOperationType(YesNoEnum.yes.getIndex());
                 durationLog.setOperationTime(new Date());
+                durationLog.setCreateTime(new Date());
                 durationLogService.save(durationLog);
                 consumerWallet.setRemainingDuration(consumerWallet.getRemainingDuration().add(sOrder.getDuration()));
                 consumerWalletService.updateById(consumerWallet);
@@ -1204,6 +1205,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 balanceLog.setCurrentBalance(consumerWallet.getBalance());
                 balanceLog.setOperationType(YesNoEnum.yes.getIndex());
                 balanceLog.setOperationTime(new Date());
+                balanceLog.setCreateTime(new Date());
                 balanceLogService.save(balanceLog);
                 consumerWallet.setBalance(consumerWallet.getBalance().add(sOrder.getBalance()));
                 consumerWalletService.updateById(consumerWallet);
@@ -1282,6 +1284,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
             consumerWallet.setRemainingIntegral(integral);
             integralLog.setOperationType(YesNoEnum.no.getIndex());
             integralLog.setOperationTime(new Date());
+            integralLog.setCreateTime(new Date());
             integralLogService.save(integralLog);
             consumerWalletService.updateById(consumerWallet);
             MemberProgressLog memberProgressLog = new MemberProgressLog();

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

@@ -83,6 +83,7 @@
             <if test="payTime != null ">and o.pay_time = #{payTime}</if>
             <if test="isDelete != null ">and o.is_delete = #{isDelete}</if>
         </where>
+        order by o.create_time desc
     </select>
 
     <select id="selectEquityMembersOrderById" parameterType="Long" resultMap="EquityMembersOrderResult">

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

@@ -109,6 +109,7 @@
             <if test="terminalTrace != null  and terminalTrace != ''">and r.terminal_trace = #{terminalTrace}</if>
             <if test="payTime != null ">and r.pay_time = #{payTime}</if>
         </where>
+        order by r.create_time desc
     </select>
 
     <select id="selectRechargeById" parameterType="Long" resultMap="RechargeResult">