banner create

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/BannersParam.java

@@ -24,6 +24,7 @@ import java.util.List;
 public class BannersParam implements Serializable {
     @ApiModelProperty(value = "Banner主键ID", example = "9822346783245")
     private String bannersId;
+    private String ids;
 
     @ApiModelProperty(value = "标题", required = true, example = "这是一个banner标题")
     @NotBlank(message = "请填写标题")
@@ -62,10 +63,10 @@ public class BannersParam implements Serializable {
 
     @ApiModelProperty(value = "展示的位置 多选 数组", example = "[\"1\", \"3\", \"5\", \"6\", \"8\"]")
     @NotEmpty(message = "请选择展示位置")
-    private List positionList;
+    private List<String> positionList;
 
     @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"110000\", \"120000\", \"210100\"]")
-    private List provincesList;
+    private List<String> provincesList;
 
     @ApiModelProperty(value = "推广省份 多选 数组", example = "[\"北京市\", \"天津市\", \"沈阳市\"]")
     private List provincesNameList;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-common/src/main/java/com/liquidnet/client/admin/common/enums/BannersTargetType.java

@@ -65,4 +65,13 @@ public enum BannersTargetType {
     public static List<Object> getResultType() {
         return resultTypeListR;
     }
+
+    public static String getTypeName(int index) {
+        for (BannersTargetType c : BannersTargetType.values()) {
+            if (c.getIndex() == index) {
+                return c.name;
+            }
+        }
+        return null;
+    }
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinBannersAdminController.java

@@ -105,7 +105,7 @@ public class KylinBannersAdminController extends BaseController {
     @RequiresPermissions("kylin:banners:create")
     @PostMapping("create")
     @ResponseBody
-    public AjaxResult createSave(@RequestBody @Validated BannersParam bannersParam) {
+    public AjaxResult createSave(BannersParam bannersParam) {
         Boolean res = kylinBannersServiceImpl.create(bannersParam);
         if (res) {
             return success();
@@ -155,7 +155,7 @@ public class KylinBannersAdminController extends BaseController {
     @PostMapping("delete")
     @ResponseBody
     public AjaxResult delete(BannersParam bannersParam) {
-        String bannersId = bannersParam.getBannersId();
+        String bannersId = bannersParam.getIds();
         boolean result = kylinBannersServiceImpl.delete(bannersId);
         if (result) {
             return success("删除成功");

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/kylin/KylinOrderRefundAdminController.java

@@ -20,6 +20,8 @@ import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * <p>
  * 后台单订单退款 服务实现类

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/banners/banners.html

@@ -53,8 +53,7 @@
             <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="kylin:banners:create">
                 <i class="fa fa-plus"></i> 添加
             </a>
-            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll('确定取消选中的退款申请吗？', 'banners/delete')"
-               shiro:hasPermission="kylin:banners:delete">
+            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="kylin:banners:delete">
                 删除
             </a>
         </div>
@@ -66,7 +65,7 @@
 <th:block th:include="include :: footer"/>
 <script th:inline="javascript">
     var updateFlag = [[${@permission.hasPermi('kylin:banners:update')}]];
-    var deleteFlag = [[${@permission.hasPermi('kylin:banners:delete')}]];
+    var removeFlag = [[${@permission.hasPermi('kylin:banners:delete')}]];
 
     var prefix = ctx + "kylin/banners";
     $(function () {
@@ -74,8 +73,8 @@
             url: prefix + "/list",
             updateUrl: prefix + "/update",
             createUrl: prefix + "/create",
-            deleteUrl: prefix + "/delete",
-            modalName: "-Banner",
+            removeUrl: prefix + "/delete",
+            modalName: "Banner",
             columns: [{
                 checkbox: true
             },
@@ -99,7 +98,7 @@
                     title: '推广类型'
                 },
                 {
-                    field: 'targetType',
+                    field: 'targetTypeName',
                     title: '跳转类型'
                 },
                 {
@@ -127,8 +126,8 @@
                     align: 'center',
                     formatter: function (value, row, index) {
                         var actions = [];
-                        actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="review(\'' + row.orderRefundsId + '\')"></i>编辑</a> ');
-                        actions.push('<a class="btn btn-danger btn-xs ' + deleteFlag + '" href="javascript:void(0)" onclick="execute(\'' + row.orderRefundsId + '\')"></i>删除</a> ');
+                        actions.push('<a class="btn btn-success btn-xs ' + updateFlag + '" href="javascript:void(0)" onclick="review(\'' + row.bannersId + '\')"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.bannersId + '\')"></i>删除</a> ');
                         return actions.join('');
                     }
                 }]

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/kylin/refund/applyView.html

@@ -89,7 +89,6 @@
 		}
         if ($.validate.form()) {
             var data = $('#form-post-add').serializeArray();
-            data.push({"ticketEntityIds":rows.join()});
             data.push({"name":"ticketEntityIds","value":rows});
             $.operate.save(prefix + "/apply", data);
         }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinBannersServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.enums.BannersTargetType;
 import com.liquidnet.common.cache.redis.util.RedisUtil;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.IDGenerator;
@@ -81,15 +82,21 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
             List<String> positionList = bannersParam.getPositionList();
             KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
+            String bannersRelationsId = IDGenerator.nextSnowId().toString();
+            kylinBannersRelations.setBannersRelationsId(bannersRelationsId);
+            kylinBannersRelations.setBannersId(bannersId);
+            kylinBannersRelations.setCreatedAt(createdAtString);
             for (String fieldId : positionList) {
-                KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 1, createdAtString);
-                kylinBannersRelationsMapper.insert(relations);
+                kylinBannersRelations.setFieldId(fieldId);
+                kylinBannersRelations.setFieldIdType(1);
+                kylinBannersRelationsMapper.insert(kylinBannersRelations);
             }
             List<String> provincesList = bannersParam.getProvincesList();
             if (!provincesList.isEmpty()) {
                 for (String fieldId : provincesList) {
-                    KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 2, createdAtString);
-                    kylinBannersRelationsMapper.insert(relations);
+                    kylinBannersRelations.setFieldId(fieldId);
+                    kylinBannersRelations.setFieldIdType(2);
+                    kylinBannersRelationsMapper.insert(kylinBannersRelations);
                 }
             } else {
                 provincesList = new ArrayList();
@@ -151,13 +158,18 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
 
             List<String> positionList = bannersParam.getPositionList();
             KylinBannersRelations kylinBannersRelations = new KylinBannersRelations();
+            String bannersRelationsId = IDGenerator.nextSnowId().toString();
+            kylinBannersRelations.setBannersRelationsId(bannersRelationsId);
+            kylinBannersRelations.setBannersId(bannersId);
+            kylinBannersRelations.setCreatedAt(updatedAtString);
             // 入数据库 先删除之前的
             kylinBannersRelationsMapper.delete(
                     new UpdateWrapper<KylinBannersRelations>().eq("banners_id", bannersId).eq("field_id_type", 1)
             );
             for (String fieldId : positionList) {
-                KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 1, updatedAtString);
-                kylinBannersRelationsMapper.insert(relations);
+                kylinBannersRelations.setFieldId(fieldId);
+                kylinBannersRelations.setFieldIdType(1);
+                kylinBannersRelationsMapper.insert(kylinBannersRelations);
             }
             List<String> provincesList = bannersParam.getProvincesList();
             if (!provincesList.isEmpty()) {
@@ -166,8 +178,9 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
                         new UpdateWrapper<KylinBannersRelations>().eq("banners_id", bannersId).eq("field_id_type", 2)
                 );
                 for (String fieldId : provincesList) {
-                    KylinBannersRelations relations = kylinBannersRelations.newData(bannersId, fieldId, 2, updatedAtString);
-                    kylinBannersRelationsMapper.insert(relations);
+                    kylinBannersRelations.setFieldId(fieldId);
+                    kylinBannersRelations.setFieldIdType(2);
+                    kylinBannersRelationsMapper.insert(kylinBannersRelations);
                 }
             } else {
                 provincesList = new ArrayList();
@@ -222,6 +235,9 @@ public class KylinBannersServiceImpl extends ServiceImpl<KylinBannersMapper, Kyl
             for (BannerDetailsListDao item : voList) {
                 item.setIsOnlineName(item.getIsOnline());
                 item.setPromotionTypeName(item.getPromotionType());
+
+                String typeName = BannersTargetType.getTypeName(item.getTargetType());
+                item.setTargetTypeName(typeName);
             }
             pageInfoTmp = new PageInfo(voList);
         } catch (Exception e) {

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/BannerDetailsListDao.java

@@ -14,7 +14,8 @@ public class BannerDetailsListDao implements Serializable {
 
     private String coverImg;
 
-    private String targetType;
+    private Integer targetType;
+    private String targetTypeName;
 
     private String targetObj;
 

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/entity/KylinBannersRelations.java

@@ -54,16 +54,4 @@ public class KylinBannersRelations implements Serializable {
      */
     private String updatedAt;
 
-    // 整合入库数据
-//    @JsonIgnore
-    public KylinBannersRelations newData(String bannersId, String fieldId, int fieldIdType, String createdAtString) {
-//        String bannersRelationsId = IDGenerator.nextSnowId().toString();
-//        this.setBannersRelationsId(bannersRelationsId);
-        this.setBannersId(bannersId);
-        this.setFieldId(fieldId);
-        this.setFieldIdType(fieldIdType);
-        this.setCreatedAt(createdAtString);
-        return this;
-    }
-
 }