Browse Source

Merge branch 'release_toaliyun_real' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real

release_toaliyun_real
winter 1 year ago
parent
commit
dd2422236f
4 changed files with 18 additions and 1 deletions
  1. +6
    -0
      mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/enums/EnumLegionActivityStatus.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java
  4. +10
    -0
      mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml

+ 6
- 0
mallinkBApi/src/main/java/com/iformall/controller/WxLegionActivityController.java View File

@@ -9,6 +9,7 @@ import com.iformall.domain.po.WxLegionActivity;
import com.iformall.domain.po.base.BaseEntity.SortField;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumLegionActivityStatus;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.service.WxLegionActivityService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -50,6 +51,11 @@ public class WxLegionActivityController extends BaseController {
wxLegionActivity.setSortColumns(SortField.CreateDate_DESC);
wxLegionActivity.setNeedCount(false);
wxLegionActivity.setMerchantId(getLoginBUser().getMerchantId());

//已开始
if(EnumLegionActivityStatus.ON_LINE.getCode().equals(wxLegionActivity.getStatus())){
wxLegionActivity.setStartStatus(EnumYesOrNo.YES.getCode());
}
final PageInfo<WxLegionActivity> page = wxLegionActivityService.listAsPage(wxLegionActivity,pageNum, pageSize);
return new ResultData(page);
}


+ 1
- 1
mallinkService/src/main/java/com/iformall/enums/EnumLegionActivityStatus.java View File

@@ -43,7 +43,7 @@ public enum EnumLegionActivityStatus {
public static List<Integer> getLine() {
List<Integer> line = new ArrayList<Integer>();
line.add(ON_LINE.code);
line.add(OFF_LINE.code);
// line.add(OFF_LINE.code);
return line;
}



+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java View File

@@ -64,6 +64,7 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{

private void handlerQuery(WxLegionActivity record) {
if (null != record.getStatus()) {

//已上架
if(EnumLegionActivityStatus.ON_LINE.getCode().equals(record.getStatus())){
record.setValidStatus(EnumYesOrNo.NO.getCode());


+ 10
- 0
mallinkService/src/main/resources/mapper/WxLegionActivityMapper.xml View File

@@ -48,6 +48,16 @@
and `start_time` &gt;= #{begin}
</if>

<!-- 未开始 -->
<if test=" 0 == startStatus">
and start_time &lt;= now()
</if>

<!-- 已开始 -->
<if test=" 1 == startStatus">
and start_time &gt;= now()
</if>

<if test=" null != end">
and `end_time` &lt;= #{end}
</if>


Loading…
Cancel
Save