社区活动编辑删除奖品

huanghongfa

2021-01-14 3e9ccc47f511c0f1bb018b986c013a0105715ce4

社区活动编辑删除奖品

 springcloud_k8s_panzhihuazhihuishequ/.idea/workspace.xml

@@ -24,7 +24,9 @@
  <component name="ChangeListManager">
    <list default="true" id="8ba27629-3e5d-4f42-993e-d0c055bc9371" name="Default Changelist" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/dao/ComActMicroWishDAO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" beforeDir="false" afterPath="$PROJECT_DIR$/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" beforeDir="false" afterPath="$PROJECT_DIR$/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -390,7 +392,7 @@
      <workItem from="1610326930387" duration="5497000" />
      <workItem from="1610368400707" duration="771000" />
      <workItem from="1610415637750" duration="6485000" />
      <workItem from="1610499071420" duration="21465000" />
      <workItem from="1610499071420" duration="23524000" />
    </task>
    <servers />
  </component>
@@ -442,54 +444,54 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="549" y="167" key="FileChooserDialogImpl/0.0.1536.824@0.0.1536.824" timestamp="1610368574903" />
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610594231149">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610594231149" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610594231148">
    <state width="1031" height="544" key="GridCell.Tab.0.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.0.center" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610594231148" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610594231147">
    <state width="1031" height="544" key="GridCell.Tab.0.center/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.0.left" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610594231147" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610594231149">
    <state width="1031" height="544" key="GridCell.Tab.0.left/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.0.right" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610594231149" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610594231150">
    <state width="1031" height="544" key="GridCell.Tab.0.right/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.1.bottom" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610594231150">
    <state width="1031" height="544" key="GridCell.Tab.1.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.1.center" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610594231149">
    <state width="1031" height="544" key="GridCell.Tab.1.center/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.1.left" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610594231149" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610594231150">
    <state width="1031" height="544" key="GridCell.Tab.1.left/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.1.right" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610594231150">
    <state width="1031" height="544" key="GridCell.Tab.1.right/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.2.bottom" timestamp="1610602951684">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610594231150">
    <state width="1031" height="544" key="GridCell.Tab.2.bottom/0.0.1536.824@0.0.1536.824" timestamp="1610602951684" />
    <state width="1031" height="544" key="GridCell.Tab.2.center" timestamp="1610602951684">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610594231150">
    <state width="1031" height="544" key="GridCell.Tab.2.center/0.0.1536.824@0.0.1536.824" timestamp="1610602951684" />
    <state width="1031" height="544" key="GridCell.Tab.2.left" timestamp="1610602951683">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610594231150">
    <state width="1031" height="544" key="GridCell.Tab.2.left/0.0.1536.824@0.0.1536.824" timestamp="1610602951683" />
    <state width="1031" height="544" key="GridCell.Tab.2.right" timestamp="1610602951684">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610594231150" />
    <state width="1031" height="544" key="GridCell.Tab.2.right/0.0.1536.824@0.0.1536.824" timestamp="1610602951684" />
    <state x="299" y="67" key="Maven.ArtifactSearchDialog" timestamp="1610072873414">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
@@ -510,10 +512,10 @@
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="93" y="93" width="1350" height="638" key="com.intellij.history.integration.ui.views.FileHistoryDialog/0.0.1536.824@0.0.1536.824" timestamp="1609226181026" />
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610600693042">
    <state x="468" y="42" width="766" height="782" key="find.popup" timestamp="1610602991035">
      <screen x="0" y="0" width="1536" height="824" />
    </state>
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610600693042" />
    <state x="468" y="42" width="766" height="782" key="find.popup/0.0.1536.824@0.0.1536.824" timestamp="1610602991035" />
    <state width="600" height="428" key="javadoc.popup" timestamp="1610005781618">
      <screen x="0" y="0" width="1536" height="824" />
    </state>

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComActActivityVO.java

@@ -122,6 +122,10 @@
    @ApiModelProperty("活动类型 1 支援者活动 2 普通社区活动 3 党建活动")
    private Integer type;

    @ApiModelProperty("活动创建时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private Date createAt;



}

 springcloud_k8s_panzhihuazhihuishequ/common/target/classes/com/panzhihua/common/model/vos/community/ComActActivityVO.class

Binary files differ

 springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityActivityApi.java

@@ -147,7 +147,7 @@
        return r;
    }

    @ApiOperation(value = "活动详情")
    @ApiOperation(value = "活动详情",response = ComActActivityVO.class)
    @GetMapping("detailactivity")
    public R detailActivity(@RequestParam("id") Long id) {
        Long userId = this.getUserId();

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommunityApi.java

@@ -109,8 +109,8 @@
        boolean ok = R.isOk(r);
        if (ok) {
            Integer hasPrize = comActActivityVO.getHasPrize();
            Long actActivityVOId = comActActivityVO.getId();
            if (!ObjectUtils.isEmpty(comActActPrizeVOList) && hasPrize.intValue() == 1) {
                Long actActivityVOId = comActActivityVO.getId();
                comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
                if (!ObjectUtils.isEmpty(comActActPrizeVOList)) {
                    List<ComActActPrizeDO> comActActPrizeDOS = new ArrayList<>();
@@ -125,6 +125,9 @@
                        return R.fail("保存奖品失败");
                    }
                }
            }else if(hasPrize.intValue() == 0){
                boolean remove = comActActPrizeService.remove(new QueryWrapper<ComActActPrizeDO>().lambda().eq(ComActActPrizeDO::getActivityId, actActivityVOId));
                log.info("删除社区活动奖品结果【{}】，社区活动id【{}】",remove,actActivityVOId);
            }
        }
        return r;