补发卡券功能

order/src/main/java/com/order/controller/business/OrderCouponController.java

@@ -1,6 +1,7 @@
 package com.order.controller.business;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.fastjson.JSONObject;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.hfkj.common.exception.ErrorCode;
@@ -10,14 +11,20 @@ import com.hfkj.common.security.UserCenter;
 import com.hfkj.common.utils.DateUtil;
 import com.hfkj.common.utils.ResponseMsgUtil;
 import com.hfkj.config.CommonSysConst;
+import com.hfkj.entity.BsOrderChild;
 import com.hfkj.entity.BsOrderCoupon;
 import com.hfkj.entity.FileRecords;
 import com.hfkj.model.ResponseData;
 import com.hfkj.model.SecUserSessionObject;
+import com.hfkj.model.order.OrderChildModel;
 import com.hfkj.model.order.OrderCouponModel;
+import com.hfkj.model.order.OrderModel;
 import com.hfkj.service.coupon.BsOrderCouponNoService;
 import com.hfkj.service.coupon.BsOrderCouponService;
 import com.hfkj.service.file.FileRecordsService;
+import com.hfkj.service.order.BsOrderChildService;
+import com.hfkj.service.order.BsOrderService;
+import com.hfkj.service.order.OrderPaySuccessService;
 import com.hfkj.sysenum.SecUserObjectTypeEnum;
 import com.hfkj.sysenum.fileRecords.FileRecordsEnum;
 import com.hfkj.sysenum.order.OrderChildStatusEnum;
@@ -27,13 +34,11 @@ import com.hfkj.sysenum.order.OrderPayTypeEnum;
 import com.order.utils.excel.OrderCouponExcelMergeHandler;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.*;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
 import org.thymeleaf.util.DateUtils;
 
 import javax.annotation.Resource;
@@ -59,6 +64,12 @@ public class OrderCouponController {
     private UserCenter userCenter;
     @Resource
     private FileRecordsService fileRecordsService;
+    @Resource
+    private OrderPaySuccessService orderPaySuccessService;
+    @Resource
+    private BsOrderService orderService;
+    @Resource
+    private BsOrderChildService orderChildService;
 
     @RequestMapping(value="/queryCouNo",method = RequestMethod.GET)
     @ResponseBody
@@ -99,6 +110,35 @@ public class OrderCouponController {
         }
     }
 
+    @RequestMapping(value="/reissue",method = RequestMethod.POST)
+    @ResponseBody
+    @ApiOperation(value = "补发")
+    public ResponseData reissue(@RequestBody JSONObject body) {
+        try {
+            if (body == null || StringUtils.isBlank(body.getString("orderChildNo"))) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
+            }
+            // 查询订单
+            OrderChildModel orderChild = orderChildService.getDetail(body.getString("orderChildNo"));
+            if (orderChild == null) {
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的商品订单");
+            }
+            OrderModel orderModel = orderService.getDetail(orderChild.getOrderNo());
+            if (orderChild.getStatus().equals(OrderChildStatusEnum.status2.getCode())
+                || orderChild.getStatus().equals(OrderChildStatusEnum.status3.getCode())) {
+                orderPaySuccessService.product(orderModel, orderChild);
+                return ResponseMsgUtil.success("操作成功");
+            }
+
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "补发失败，订单状态不正确");
+
+        } catch (Exception e) {
+            log.error("error!",e);
+            return ResponseMsgUtil.exception(e);
+        }
+    }
+
+
     @RequestMapping(value="/queryList",method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询交易订单列表")

service/src/main/java/com/hfkj/entity/CmsContent.java

@@ -1,264 +0,0 @@
-package com.hfkj.entity;
-
-import java.io.Serializable;
-import java.util.Date;
-
-/**
- * cms_content
- * @author 
- */
-/**
- * 
- * 代码由工具生成
- * 
- **/
-public class CmsContent implements Serializable {
-    /**
-     * 主键
-     */
-    private Long id;
-
-    /**
-     * 登录平台code
-     */
-    private String platformCode;
-
-    /**
-     * 编码
-     */
-    private String code;
-
-    /**
-     * 名称
-     */
-    private String name;
-
-    /**
-     * 图片
-     */
-    private String img;
-
-    /**
-     * 跳转类型：1.小程序 2.h5 3:内部跳转
-     */
-    private Integer jumpType;
-
-    /**
-     * 跳转地址
-     */
-    private String jumpUrl;
-
-    /**
-     * 应用ID
-     */
-    private String appid;
-
-    /**
-     * 创建时间
-     */
-    private Date createTime;
-
-    /**
-     * 更新时间
-     */
-    private Date updateTime;
-
-    /**
-     * 状态 1： 正常 0删除
-     */
-    private Integer status;
-
-    private String ext1;
-
-    private String ext2;
-
-    private String ext3;
-
-    private static final long serialVersionUID = 1L;
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public String getPlatformCode() {
-        return platformCode;
-    }
-
-    public void setPlatformCode(String platformCode) {
-        this.platformCode = platformCode;
-    }
-
-    public String getCode() {
-        return code;
-    }
-
-    public void setCode(String code) {
-        this.code = code;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getImg() {
-        return img;
-    }
-
-    public void setImg(String img) {
-        this.img = img;
-    }
-
-    public Integer getJumpType() {
-        return jumpType;
-    }
-
-    public void setJumpType(Integer jumpType) {
-        this.jumpType = jumpType;
-    }
-
-    public String getJumpUrl() {
-        return jumpUrl;
-    }
-
-    public void setJumpUrl(String jumpUrl) {
-        this.jumpUrl = jumpUrl;
-    }
-
-    public String getAppid() {
-        return appid;
-    }
-
-    public void setAppid(String appid) {
-        this.appid = appid;
-    }
-
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
-    public Date getUpdateTime() {
-        return updateTime;
-    }
-
-    public void setUpdateTime(Date updateTime) {
-        this.updateTime = updateTime;
-    }
-
-    public Integer getStatus() {
-        return status;
-    }
-
-    public void setStatus(Integer status) {
-        this.status = status;
-    }
-
-    public String getExt1() {
-        return ext1;
-    }
-
-    public void setExt1(String ext1) {
-        this.ext1 = ext1;
-    }
-
-    public String getExt2() {
-        return ext2;
-    }
-
-    public void setExt2(String ext2) {
-        this.ext2 = ext2;
-    }
-
-    public String getExt3() {
-        return ext3;
-    }
-
-    public void setExt3(String ext3) {
-        this.ext3 = ext3;
-    }
-
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        CmsContent other = (CmsContent) that;
-        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
-            && (this.getPlatformCode() == null ? other.getPlatformCode() == null : this.getPlatformCode().equals(other.getPlatformCode()))
-            && (this.getCode() == null ? other.getCode() == null : this.getCode().equals(other.getCode()))
-            && (this.getName() == null ? other.getName() == null : this.getName().equals(other.getName()))
-            && (this.getImg() == null ? other.getImg() == null : this.getImg().equals(other.getImg()))
-            && (this.getJumpType() == null ? other.getJumpType() == null : this.getJumpType().equals(other.getJumpType()))
-            && (this.getJumpUrl() == null ? other.getJumpUrl() == null : this.getJumpUrl().equals(other.getJumpUrl()))
-            && (this.getAppid() == null ? other.getAppid() == null : this.getAppid().equals(other.getAppid()))
-            && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
-            && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
-            && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
-            && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
-            && (this.getExt2() == null ? other.getExt2() == null : this.getExt2().equals(other.getExt2()))
-            && (this.getExt3() == null ? other.getExt3() == null : this.getExt3().equals(other.getExt3()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
-        result = prime * result + ((getPlatformCode() == null) ? 0 : getPlatformCode().hashCode());
-        result = prime * result + ((getCode() == null) ? 0 : getCode().hashCode());
-        result = prime * result + ((getName() == null) ? 0 : getName().hashCode());
-        result = prime * result + ((getImg() == null) ? 0 : getImg().hashCode());
-        result = prime * result + ((getJumpType() == null) ? 0 : getJumpType().hashCode());
-        result = prime * result + ((getJumpUrl() == null) ? 0 : getJumpUrl().hashCode());
-        result = prime * result + ((getAppid() == null) ? 0 : getAppid().hashCode());
-        result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
-        result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
-        result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
-        result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
-        result = prime * result + ((getExt2() == null) ? 0 : getExt2().hashCode());
-        result = prime * result + ((getExt3() == null) ? 0 : getExt3().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", id=").append(id);
-        sb.append(", platformCode=").append(platformCode);
-        sb.append(", code=").append(code);
-        sb.append(", name=").append(name);
-        sb.append(", img=").append(img);
-        sb.append(", jumpType=").append(jumpType);
-        sb.append(", jumpUrl=").append(jumpUrl);
-        sb.append(", appid=").append(appid);
-        sb.append(", createTime=").append(createTime);
-        sb.append(", updateTime=").append(updateTime);
-        sb.append(", status=").append(status);
-        sb.append(", ext1=").append(ext1);
-        sb.append(", ext2=").append(ext2);
-        sb.append(", ext3=").append(ext3);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
-    }
-}