修改导出兑换码

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/java/com/liquidnet/service/goblin/mapper/GoblinNftExCodeMapper.java

@@ -94,4 +94,12 @@ public interface GoblinNftExCodeMapper extends BaseMapper<GoblinNftExCode> {
      * @return
      */
     int updateCodeAdminUids(@Param("codes") String codes, @Param("adminUid") String adminUid);
+
+
+    /**
+     * excel导出打乱兑换码顺序
+     * @param goblinNftExCode
+     * @return
+     */
+    List<GoblinNftExCode> selectGoblinNftCodeExcel(GoblinNftExCode goblinNftExCode);
 }

liquidnet-bus-do/liquidnet-service-goblin-do/src/main/resources/com.liquidnet.service.goblin.mapper/GoblinNftExCodeMapper.xml

@@ -129,6 +129,58 @@
 
     </select>
 
+    <select id="selectGoblinNftCodeExcel" parameterType="com.liquidnet.service.goblin.entity.GoblinNftExCode"
+            resultMap="BeseResult">
+        select
+        DISTINCT
+        gnec.code,gnec.code_id,gnec.sku_id,gnec.box_sku_id,gnec.activity_id,gnec.state,gnec.redeem_uid,gnec.redeem_at,gnec.admin_uid,gnec.created_at
+        from goblin_nft_ex_code gnec inner join goblin_nft_ex_sku gnes on gnec.sku_id = gnes.sku_id and gnes.activity_id
+        = gnec.activity_id
+        <where>
+            <if test="code != null and code != ''">
+                and gnec.code = #{code,jdbcType=VARCHAR}
+            </if>
+            <if test="activityId != null and activityId != ''">
+                and gnec.activity_id = #{activityId,jdbcType=VARCHAR}
+            </if>
+            <if test="state != null">
+                <choose>
+                    <when test="state == 1">
+                        and (now() BETWEEN gnes.ex_start_time and gnes.ex_stop_time) and
+                        gnec.state =1
+                    </when>
+                    <when test="state == 2">
+                        and gnec.state = 2
+                    </when>
+                    <when test="state == 3">
+                        and (((now() &gt; gnes.ex_stop_time) AND gnec.state = 1) ||
+                        gnec.state = 3)
+                    </when>
+                </choose>
+            </if>
+            <if test="redeemUid != null and redeemUid != ''">
+                and gnec.redeem_uid = #{redeemUid,jdbcType=VARCHAR}
+            </if>
+            <if test="skuId != null and skuId != ''">
+                and gnec.sku_id in
+                <foreach collection="skuId.split(',')" item="sId" open="(" separator="," close=")">
+                    #{sId,jdbcType=VARCHAR}
+                </foreach>
+            </if>
+            <if test="isDrivi != null">
+                <choose>
+                    <when test="isDrivi == 1">
+                        and gnec.admin_uid = ''
+                    </when>
+                    <when test="isDrivi == 2">
+                        and gnec.admin_uid != ''
+                    </when>
+                </choose>
+            </if>
+        </where>
+        ORDER BY gnec.code desc
+    </select>
+
     <select id="selectCodeAvailableByActivityId" resultMap="BeseResult">
         select DISTINCT gnec.code,
                         gnec.code_id,

liquidnet-bus-service/liquidnet-service-platform/liquidnet-service-platform-impl/src/main/java/com/liquidnet/service/platform/service/impl/goblin/GoblinNftExCodeServiceImpl.java

@@ -284,7 +284,7 @@ public class GoblinNftExCodeServiceImpl implements IGoblinNftExCodeService {
 
 
         // PageHelper.startPage(goblinNftExCodeParam.getPageNum(), 20, true);
-        List<GoblinNftExCode> goblinNftExCodes = goblinNftExCodeMapper.selectGoblinNftCode(goblinNftExCode);
+        List<GoblinNftExCode> goblinNftExCodes = goblinNftExCodeMapper.selectGoblinNftCodeExcel(goblinNftExCode);
 
         StringBuffer skuIds = new StringBuffer();
         StringBuffer acticityIds = new StringBuffer();