## 直推升级撤单降级;
This commit is contained in:
		
							parent
							
								
									3314fdb8d9
								
							
						
					
					
						commit
						9c8b9c3634
					
				| 
						 | 
					@ -3,11 +3,8 @@ package com.hzs.activity.recommend.service.impl;
 | 
				
			||||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 | 
					import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 | 
				
			||||||
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 | 
					import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 | 
				
			||||||
import com.hzs.activity.recommend.mapper.AcRecomUpgradeRecordMapper;
 | 
					import com.hzs.activity.recommend.mapper.AcRecomUpgradeRecordMapper;
 | 
				
			||||||
import com.hzs.activity.recommend.param.AcDirectPushUpgradeListParam;
 | 
					 | 
				
			||||||
import com.hzs.activity.recommend.service.IAcRecomUpgradeRecordService;
 | 
					import com.hzs.activity.recommend.service.IAcRecomUpgradeRecordService;
 | 
				
			||||||
import com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO;
 | 
					 | 
				
			||||||
import com.hzs.common.core.enums.EDelFlag;
 | 
					import com.hzs.common.core.enums.EDelFlag;
 | 
				
			||||||
import com.hzs.common.core.web.page.TableDataInfo;
 | 
					 | 
				
			||||||
import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecord;
 | 
					import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecord;
 | 
				
			||||||
import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecordExt;
 | 
					import com.hzs.common.domain.activity.recommend.AcRecomUpgradeRecordExt;
 | 
				
			||||||
import com.hzs.common.domain.sale.order.SaOrder;
 | 
					import com.hzs.common.domain.sale.order.SaOrder;
 | 
				
			||||||
| 
						 | 
					@ -56,9 +53,4 @@ public class AcRecomUpgradeRecordServiceImpl extends ServiceImpl<AcRecomUpgradeR
 | 
				
			||||||
        return baseMapper.listRecomOrder(pkMember, pkGrade, num, startTime, endTime);
 | 
					        return baseMapper.listRecomOrder(pkMember, pkGrade, num, startTime, endTime);
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @Override
 | 
					 | 
				
			||||||
    public List<AcDirectPushUpgradeListVO> queryList(AcDirectPushUpgradeListParam param) {
 | 
					 | 
				
			||||||
        return baseMapper.queryList(param);
 | 
					 | 
				
			||||||
    }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -61,40 +61,5 @@
 | 
				
			||||||
        ) t
 | 
					        ) t
 | 
				
			||||||
        where #{num} >= rownum
 | 
					        where #{num} >= rownum
 | 
				
			||||||
    </select>
 | 
					    </select>
 | 
				
			||||||
      <select id="queryList" resultType="com.hzs.activity.recommend.vo.AcDirectPushUpgradeListVO">
 | 
					 | 
				
			||||||
        SELECT
 | 
					 | 
				
			||||||
        abc.ACT_NAME,
 | 
					 | 
				
			||||||
        cm.member_code,
 | 
					 | 
				
			||||||
        cm.member_name,
 | 
					 | 
				
			||||||
        arur.PK_SETTLE_GRADE,
 | 
					 | 
				
			||||||
        arur.PK_RECOMMEND_GRADE,
 | 
					 | 
				
			||||||
        abc.ACT_START_DATE,
 | 
					 | 
				
			||||||
        abc.ACT_END_DATE,
 | 
					 | 
				
			||||||
        arur.CREATION_TIME,
 | 
					 | 
				
			||||||
        arur.UPGRADE_TIME
 | 
					 | 
				
			||||||
        FROM
 | 
					 | 
				
			||||||
        AC_RECOM_UPGRADE_RECORD arur
 | 
					 | 
				
			||||||
        LEFT JOIN AC_BASE_CONFIG abc ON arur.PK_BASE_ID = abc.PK_ID
 | 
					 | 
				
			||||||
        LEFT JOIN CU_MEMBER cm ON arur.pk_member = cm.pk_id
 | 
					 | 
				
			||||||
        WHERE arur.DEL_FLAG = 0
 | 
					 | 
				
			||||||
        <if test="actName != null">
 | 
					 | 
				
			||||||
            AND abc.ACT_NAME = #{actName}
 | 
					 | 
				
			||||||
        </if>
 | 
					 | 
				
			||||||
        <if test="memberCode != null">
 | 
					 | 
				
			||||||
            AND cm.member_code = #{memberCode}
 | 
					 | 
				
			||||||
        </if>
 | 
					 | 
				
			||||||
        <if test="startActStartDate != null">
 | 
					 | 
				
			||||||
            AND abc.ACT_START_DATE >= #{startActStartDate}
 | 
					 | 
				
			||||||
        </if>
 | 
					 | 
				
			||||||
        <if test="startActEndDate != null">
 | 
					 | 
				
			||||||
            AND abc.ACT_START_DATE <= #{startActEndDate}
 | 
					 | 
				
			||||||
        </if>
 | 
					 | 
				
			||||||
        <if test="startActEndDate != null">
 | 
					 | 
				
			||||||
            AND abc.ACT_END_DATE >= #{endActStartDate}
 | 
					 | 
				
			||||||
        </if>
 | 
					 | 
				
			||||||
        <if test="endActStartDate != null">
 | 
					 | 
				
			||||||
            AND abc.ACT_END_DATE <= #{endActEndDate}
 | 
					 | 
				
			||||||
        </if>
 | 
					 | 
				
			||||||
    </select>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
</mapper>
 | 
					</mapper>
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue