Merge branch 'refs/heads/dev' into test

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

@@ -498,11 +498,11 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                     if (ObjectUtil.isNotEmpty(equityFundLog)){
                         ConsumerWallet aConsumerWallet =  consumerWalletService.getOne(new LambdaQueryWrapper<ConsumerWallet>()
                                 .eq(ConsumerWallet::getConsumerId,sharingActivities.getUid()));
-                        equityFundLog.setEquityFund(equityFundLog.getEquityFund().negate());
-                        equityFundLogService.insertEquityFundLog(equityFundLog);
                         aConsumerWallet.setEquityFund(aConsumerWallet.getEquityFund().subtract(equityFundLog.getEquityFund()));
                         aConsumerWallet.setAccumulateEquityFund(aConsumerWallet.getAccumulateEquityFund().subtract(equityFundLog.getEquityFund()));
                         consumerWalletService.updateConsumerWallet(aConsumerWallet);
+                        equityFundLog.setEquityFund(equityFundLog.getEquityFund().negate());
+                        equityFundLogService.insertEquityFundLog(equityFundLog);
                     }
                 }
             }

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

@@ -51,6 +51,7 @@
             <if test="avatar != null  and avatar != ''"> and avatar = #{avatar}</if>
             <if test="newAvatar != null  and newAvatar != ''"> and new_avatar = #{newAvatar}</if>
         </where>
+        order by createTime desc
     </select>
 
     <select id="selectEquityFundLogById" parameterType="Long" resultMap="EquityFundLogResult">

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

@@ -41,6 +41,7 @@
             <if test="phone != null  and phone != ''"> and phone = #{phone}</if>
             <if test="newPhone != null  and newPhone != ''"> and new_phone = #{newPhone}</if>
         </where>
+        order by createTime desc
     </select>
 
     <select id="selectSharingActivitiesById" parameterType="Long" resultMap="SharingActivitiesResult">