朗通后台——续费接口——删除

diagbotman-service/src/main/java/com/diagbot/facade/ProductOrderFacade.java

@@ -187,16 +187,7 @@ public class ProductOrderFacade extends ProductOrderServiceImpl {
 	 */
 	public RespDTO<IPage<ProductOrderWrapper>> selectAllProductOrder(ProductOrderVO productOrderVO){
 	    Page page =new Page();
-	    if(productOrderVO.getCurrent() ==null ){
-            productOrderVO.setCurrent(1L);
-        }
-        if(productOrderVO.getSize() ==null){
-            productOrderVO.setSize(10L);
-        }
-        if(productOrderVO.getCurrent() !=0 && productOrderVO.getSize() != 0){
-            page.setCurrent(productOrderVO.getCurrent());
-            page.setSize(productOrderVO.getSize());
-        }
+	    BeanUtil.copyProperties(productOrderVO,page);
 		ProductOrderIndex productOrderIndex =new ProductOrderIndex();
 		BeanUtil.copyProperties(productOrderVO, productOrderIndex);
 		//TODO

diagbotman-service/src/main/java/com/diagbot/facade/UserRenewalsFacade.java

@@ -16,10 +16,10 @@ import com.diagbot.util.BeanUtil;
 import com.diagbot.util.DateUtil;
 import com.diagbot.util.UserUtils;
 import com.diagbot.vo.AddRenewalsInfoVO;
+import com.diagbot.vo.DeleteRenewalsInfoVO;
 import com.diagbot.vo.RenewalsInfosVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.web.bind.annotation.InitBinder;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -55,19 +55,10 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         return RespDTO.onSuc(this.save(userRenewals));
     }
 
-    @InitBinder
+
     public IPage renewalsInfo(RenewalsInfosVO renewalsInfosVO){
         Page page =new Page();
-        if(renewalsInfosVO.getCurrent() ==null ){
-            renewalsInfosVO.setCurrent(1L);
-        }
-        if(renewalsInfosVO.getSize() ==null){
-            renewalsInfosVO.setSize(10L);
-        }
-        if(renewalsInfosVO.getCurrent() !=0 && renewalsInfosVO.getSize() != 0){
-            page.setCurrent(renewalsInfosVO.getCurrent());
-            page.setSize(renewalsInfosVO.getSize());
-        }
+        BeanUtil.copyProperties(renewalsInfosVO,page);
         UserRenewalsWrapper userRenewalsWrapper =new UserRenewalsWrapper();
         BeanUtil.copyProperties(renewalsInfosVO,userRenewalsWrapper);
         if(renewalsInfosVO.getOrgName()!=null && renewalsInfosVO.getOrgName()!=""){
@@ -102,4 +93,8 @@ public class UserRenewalsFacade extends UserRenewalsServiceImpl {
         }
         return page;
     }
+
+    public Boolean deleteRenewalsInfo(DeleteRenewalsInfoVO deleteRenewalsInfoVO){
+        return this.deleteUserRenewals(deleteRenewalsInfoVO.getId());
+    }
 }

diagbotman-service/src/main/java/com/diagbot/mapper/UserRenewalsMapper.java

@@ -33,4 +33,11 @@ public interface UserRenewalsMapper extends BaseMapper<UserRenewals> {
      * @return
      */
     public IPage<RenewalsInfosDTO> selectUserRenewals(Page page,@Param("renewalsInfosVO") UserRenewalsWrapper userRenewalsWrapper);
+
+    /**
+     * 根据续费id删除续费信息
+     * @param id
+     * @return
+     */
+    public int deleteUserRenewals(Long id);
 }

diagbotman-service/src/main/java/com/diagbot/service/UserRenewalsService.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.diagbot.dto.RenewalsInfosDTO;
 import com.diagbot.entity.UserRenewals;
 import com.diagbot.entity.wrapper.UserRenewalsWrapper;
-import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -33,5 +32,12 @@ public interface UserRenewalsService extends IService<UserRenewals> {
      * @param userRenewalsWrapper
      * @return
      */
-    public IPage<RenewalsInfosDTO> selectUserRenewals(Page page, @Param("renewalsInfosVO") UserRenewalsWrapper userRenewalsWrapper);
+    public IPage<RenewalsInfosDTO> selectUserRenewals(Page page,UserRenewalsWrapper userRenewalsWrapper);
+
+    /**
+     * 根据续费id删除续费信息
+     * @param id
+     * @return
+     */
+    public Boolean deleteUserRenewals(Long id);
 }

diagbotman-service/src/main/java/com/diagbot/service/impl/UserRenewalsServiceImpl.java

@@ -33,4 +33,9 @@ public class UserRenewalsServiceImpl extends ServiceImpl<UserRenewalsMapper, Use
     public IPage<RenewalsInfosDTO> selectUserRenewals(Page page, @Param("renewalsInfosVO") UserRenewalsWrapper userRenewalsWrapper) {
         return baseMapper.selectUserRenewals(page,userRenewalsWrapper);
     }
+
+    @Override
+    public Boolean deleteUserRenewals(Long id) {
+        return baseMapper.deleteUserRenewals(id)==1 ? true:false;
+    }
 }

diagbotman-service/src/main/java/com/diagbot/vo/DeleteRenewalsInfoVO.java

@@ -0,0 +1,18 @@
+package com.diagbot.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * @Description:
+ * @author: wangyu
+ * @time: 2018/10/15 15:07
+ */
+@Setter
+@Getter
+public class DeleteRenewalsInfoVO {
+    /**
+     * 续费id
+     */
+    private Long id;
+}

diagbotman-service/src/main/java/com/diagbot/vo/ProductOrderVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,7 +11,7 @@ import lombok.Setter;
  */
 @Getter
 @Setter
-public class ProductOrderVO {
+public class ProductOrderVO extends Page{
     /**
      * 页数
      */

diagbotman-service/src/main/java/com/diagbot/vo/RenewalsInfosVO.java

@@ -1,5 +1,6 @@
 package com.diagbot.vo;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.Getter;
 import lombok.Setter;
 
@@ -10,15 +11,7 @@ import lombok.Setter;
  */
 @Setter
 @Getter
-public class RenewalsInfosVO {
-    /**
-     * 页数
-     */
-    private Long current;
-    /**
-     * 每页显示条数
-     */
-    private Long size;
+public class RenewalsInfosVO extends Page {
     /**
      * 续费状态
      */

diagbotman-service/src/main/java/com/diagbot/web/UserRenewalsController.java

@@ -6,10 +6,12 @@ import com.diagbot.annotation.SysLogger;
 import com.diagbot.dto.RenewalsInfosDTO;
 import com.diagbot.dto.RespDTO;
 import com.diagbot.facade.UserRenewalsFacade;
+import com.diagbot.vo.DeleteRenewalsInfoVO;
 import com.diagbot.vo.RenewalsInfosVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -31,15 +33,25 @@ public class UserRenewalsController {
     private UserRenewalsFacade userRenewalsFacade;
 
     @ApiOperation(value = "续费管理——显示[by:wangyu]",
-            notes = "name：产品名，必填<br>" +
-                    "decription：产品描述，必填<br> " +
-                    "url：产品访问路径，必填<br>" +
-                    "charge_type：计费方式，必填<br>" +
-                    "access_type：接入模式，必填<br>" +
-                    "trialStatus：试用状态（是否可试用）,必填<br>")
+            notes = "orgName：机构名称 <br>" +
+                    "renewalsStutas：续费状态 <br>" +
+                    "applyTime：<br>" +
+                    "size：每页显示的条数 <br>" +
+                    "curent：页数 <br>")
     @PostMapping("/renewalsInfos")
     @SysLogger("renewalsInfos")
     public RespDTO<IPage<RenewalsInfosDTO>> renewalsInfos(@RequestBody RenewalsInfosVO renewalsInfosVO) {
         return RespDTO.onSuc(userRenewalsFacade.renewalsInfo(renewalsInfosVO));
     }
+
+    @ApiOperation(value = "续费管理——删除[by:wangyu]",
+            notes = "id：续费id，必填<br>")
+    @PostMapping("/deleteRenewalsInfos")
+    @SysLogger("deleteRenewalsInfos")
+    @Transactional
+    public RespDTO<Boolean> deleteRenewalsInfos(@RequestBody DeleteRenewalsInfoVO deleteRenewalsInfoVO) {
+        return RespDTO.onSuc(userRenewalsFacade.deleteRenewalsInfo(deleteRenewalsInfoVO));
+    }
+
+
 }

diagbotman-service/src/main/resources/mapper/UserRenewalsMapper.xml

@@ -34,4 +34,8 @@
             </foreach>
         </if>
     </select>
+    
+    <update id="deleteUserRenewals">
+        UPDATE `diag_user_renewals` SET `is_deleted`='Y' WHERE (`id`=#{id})
+    </update>
 </mapper>