加入供应商 停车劵功能

java110-bean/src/main/java/com/java110/dto/supplierCoupon/SupplierCouponDto.java

@@ -1,6 +1,7 @@
 package com.java110.dto.supplierCoupon;
 
 import com.java110.dto.PageDto;
+
 import java.io.Serializable;
 import java.util.Date;
 
@@ -15,12 +16,12 @@ import java.util.Date;
 public class SupplierCouponDto extends PageDto implements Serializable {
 
     private String supplierName;
-private String supplierId;
-private String name;
-private String businessKey;
-private String remark;
-private String couponId;
-private String valuePrice;
+    private String supplierId;
+    private String name;
+    private String businessKey;
+    private String remark;
+    private String couponId;
+    private String valuePrice;
 
 
     private Date createTime;
@@ -31,43 +32,56 @@ private String valuePrice;
     public String getSupplierName() {
         return supplierName;
     }
-public void setSupplierName(String supplierName) {
+
+    public void setSupplierName(String supplierName) {
         this.supplierName = supplierName;
     }
-public String getSupplierId() {
+
+    public String getSupplierId() {
         return supplierId;
     }
-public void setSupplierId(String supplierId) {
+
+    public void setSupplierId(String supplierId) {
         this.supplierId = supplierId;
     }
-public String getName() {
+
+    public String getName() {
         return name;
     }
-public void setName(String name) {
+
+    public void setName(String name) {
         this.name = name;
     }
-public String getBusinessKey() {
+
+    public String getBusinessKey() {
         return businessKey;
     }
-public void setBusinessKey(String businessKey) {
+
+    public void setBusinessKey(String businessKey) {
         this.businessKey = businessKey;
     }
-public String getRemark() {
+
+    public String getRemark() {
         return remark;
     }
-public void setRemark(String remark) {
+
+    public void setRemark(String remark) {
         this.remark = remark;
     }
-public String getCouponId() {
+
+    public String getCouponId() {
         return couponId;
     }
-public void setCouponId(String couponId) {
+
+    public void setCouponId(String couponId) {
         this.couponId = couponId;
     }
-public String getValuePrice() {
+
+    public String getValuePrice() {
         return valuePrice;
     }
-public void setValuePrice(String valuePrice) {
+
+    public void setValuePrice(String valuePrice) {
         this.valuePrice = valuePrice;
     }
 

service-acct/src/main/java/com/java110/acct/cmd/supplierCoupon/DeleteSupplierCouponCmd.java

@@ -22,6 +22,7 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
 import com.java110.intf.acct.ISupplierCouponV1InnerServiceSMO;
 import com.java110.po.supplierCoupon.SupplierCouponPo;
 import com.java110.utils.exception.CmdException;
@@ -31,6 +32,33 @@ import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+
+@Java110CmdDoc(title = "删除供应商优惠券",
+        description = "用于外系统删除供应商优惠券",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/supplierCoupon.deleteSupplierCoupon",
+        resource = "acctDoc",
+        author = "吴学文",
+        serviceCode = "supplierCoupon.deleteSupplierCoupona"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "couponId", length = 30, remark = "优惠券ID"),
+        @Java110ParamDoc(name = "supplierId", length = 30, remark = "供应商ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\"couponId\":\"123123\",\"supplierId\":\"123123\"}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：删除
  * 服务编码：supplierCoupon.deleteSupplierCoupon
@@ -43,7 +71,7 @@ import org.slf4j.LoggerFactory;
  */
 @Java110Cmd(serviceCode = "supplierCoupon.deleteSupplierCoupon")
 public class DeleteSupplierCouponCmd extends Cmd {
-  private static Logger logger = LoggerFactory.getLogger(DeleteSupplierCouponCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(DeleteSupplierCouponCmd.class);
 
     @Autowired
     private ISupplierCouponV1InnerServiceSMO supplierCouponV1InnerServiceSMOImpl;
@@ -51,7 +79,7 @@ public class DeleteSupplierCouponCmd extends Cmd {
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "couponId", "couponId不能为空");
-Assert.hasKeyAndValue(reqJson, "supplierId", "supplierId不能为空");
+        Assert.hasKeyAndValue(reqJson, "supplierId", "supplierId不能为空");
 
     }
 
@@ -59,7 +87,7 @@ Assert.hasKeyAndValue(reqJson, "supplierId", "supplierId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       SupplierCouponPo supplierCouponPo = BeanConvertUtil.covertBean(reqJson, SupplierCouponPo.class);
+        SupplierCouponPo supplierCouponPo = BeanConvertUtil.covertBean(reqJson, SupplierCouponPo.class);
         int flag = supplierCouponV1InnerServiceSMOImpl.deleteSupplierCoupon(supplierCouponPo);
 
         if (flag < 1) {

service-acct/src/main/java/com/java110/acct/cmd/supplierCoupon/ListSupplierCouponBuyCmd.java

@@ -30,8 +30,10 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.supplierCouponBuy.SupplierCouponBuyDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
@@ -51,7 +53,7 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "supplierCoupon.listSupplierCouponBuy")
 public class ListSupplierCouponBuyCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListSupplierCouponBuyCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListSupplierCouponBuyCmd.class);
     @Autowired
     private ISupplierCouponBuyV1InnerServiceSMO supplierCouponBuyV1InnerServiceSMOImpl;
 
@@ -63,22 +65,22 @@ public class ListSupplierCouponBuyCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           SupplierCouponBuyDto supplierCouponBuyDto = BeanConvertUtil.covertBean(reqJson, SupplierCouponBuyDto.class);
+        SupplierCouponBuyDto supplierCouponBuyDto = BeanConvertUtil.covertBean(reqJson, SupplierCouponBuyDto.class);
 
-           int count = supplierCouponBuyV1InnerServiceSMOImpl.querySupplierCouponBuysCount(supplierCouponBuyDto);
+        int count = supplierCouponBuyV1InnerServiceSMOImpl.querySupplierCouponBuysCount(supplierCouponBuyDto);
 
-           List<SupplierCouponBuyDto> supplierCouponBuyDtos = null;
+        List<SupplierCouponBuyDto> supplierCouponBuyDtos = null;
 
-           if (count > 0) {
-               supplierCouponBuyDtos = supplierCouponBuyV1InnerServiceSMOImpl.querySupplierCouponBuys(supplierCouponBuyDto);
-           } else {
-               supplierCouponBuyDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            supplierCouponBuyDtos = supplierCouponBuyV1InnerServiceSMOImpl.querySupplierCouponBuys(supplierCouponBuyDto);
+        } else {
+            supplierCouponBuyDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, supplierCouponBuyDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, supplierCouponBuyDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

service-acct/src/main/java/com/java110/acct/cmd/supplierCoupon/ListSupplierCouponCmd.java

@@ -22,6 +22,7 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
 import com.java110.intf.acct.ISupplierCouponV1InnerServiceSMO;
 import com.java110.po.supplierCoupon.SupplierCouponPo;
 import com.java110.utils.exception.CmdException;
@@ -30,14 +31,46 @@ import com.java110.utils.util.BeanConvertUtil;
 import com.java110.vo.ResultVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import com.java110.dto.supplierCoupon.SupplierCouponDto;
+
 import java.util.List;
 import java.util.ArrayList;
+
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.HttpStatus;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 
+
+@Java110CmdDoc(title = "查询供应商优惠券",
+        description = "用于外系统查询供应商优惠券",
+        httpMethod = "get",
+        url = "http://{ip}:{port}/app/supplierCoupon.listSupplierCoupon",
+        resource = "acctDoc",
+        author = "吴学文",
+        serviceCode = "supplierCoupon.listSupplierCoupon"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "supplierId", length = 30, remark = "供应商ID"),
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+                @Java110ParamDoc(name = "data",type="Array",length = -1,remark = "数据节点"),
+                @Java110ParamDoc(parentNodeName = "data",name="couponId",length = 30,remark = "优惠券ID"),
+                @Java110ParamDoc(parentNodeName = "data",name="name",length = 30,remark = "优惠券名称"),
+                @Java110ParamDoc(parentNodeName = "data",name="valuePrice",length = 30,remark = "售价"),
+                @Java110ParamDoc(parentNodeName = "data",name="businessKey",length = 30,remark = "业务编号"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="http://{ip}:{port}/app/supplierCoupon.listSupplierCoupon?supplierId=123",
+        resBody="{'code':0,'msg':'成功',data:[]}"
+)
 /**
  * 类表述：查询
  * 服务编码：supplierCoupon.listSupplierCoupon
@@ -51,7 +84,7 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "supplierCoupon.listSupplierCoupon")
 public class ListSupplierCouponCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(ListSupplierCouponCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(ListSupplierCouponCmd.class);
     @Autowired
     private ISupplierCouponV1InnerServiceSMO supplierCouponV1InnerServiceSMOImpl;
 
@@ -63,22 +96,22 @@ public class ListSupplierCouponCmd extends Cmd {
     @Override
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-           SupplierCouponDto supplierCouponDto = BeanConvertUtil.covertBean(reqJson, SupplierCouponDto.class);
+        SupplierCouponDto supplierCouponDto = BeanConvertUtil.covertBean(reqJson, SupplierCouponDto.class);
 
-           int count = supplierCouponV1InnerServiceSMOImpl.querySupplierCouponsCount(supplierCouponDto);
+        int count = supplierCouponV1InnerServiceSMOImpl.querySupplierCouponsCount(supplierCouponDto);
 
-           List<SupplierCouponDto> supplierCouponDtos = null;
+        List<SupplierCouponDto> supplierCouponDtos = null;
 
-           if (count > 0) {
-               supplierCouponDtos = supplierCouponV1InnerServiceSMOImpl.querySupplierCoupons(supplierCouponDto);
-           } else {
-               supplierCouponDtos = new ArrayList<>();
-           }
+        if (count > 0) {
+            supplierCouponDtos = supplierCouponV1InnerServiceSMOImpl.querySupplierCoupons(supplierCouponDto);
+        } else {
+            supplierCouponDtos = new ArrayList<>();
+        }
 
-           ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, supplierCouponDtos);
+        ResultVo resultVo = new ResultVo((int) Math.ceil((double) count / (double) reqJson.getInteger("row")), count, supplierCouponDtos);
 
-           ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
+        ResponseEntity<String> responseEntity = new ResponseEntity<String>(resultVo.toString(), HttpStatus.OK);
 
-           cmdDataFlowContext.setResponseEntity(responseEntity);
+        cmdDataFlowContext.setResponseEntity(responseEntity);
     }
 }

service-acct/src/main/java/com/java110/acct/cmd/supplierCoupon/SaveSupplierCouponCmd.java

@@ -22,7 +22,10 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
+import com.java110.dto.supplier.SupplierDto;
 import com.java110.intf.acct.ISupplierCouponV1InnerServiceSMO;
+import com.java110.intf.scm.ISupplierV1InnerServiceSMO;
 import com.java110.po.supplierCoupon.SupplierCouponPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -32,6 +35,37 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
+
+@Java110CmdDoc(title = "添加供应商优惠券",
+        description = "用于外系统添加供应商优惠券",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/supplierCoupon.saveSupplierCoupon",
+        resource = "acctDoc",
+        author = "吴学文",
+        serviceCode = "supplierCoupon.saveSupplierCoupon"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "supplierId", length = 30, remark = "供应商ID"),
+        @Java110ParamDoc(name = "name", length = 64, remark = "名称"),
+        @Java110ParamDoc(name = "businessKey", length = 64, remark = "优惠券业务ID，第三方ID"),
+        @Java110ParamDoc(name = "valuePrice", length = 64, remark = "售价")
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\"supplierId\":\"123123\",\"name\":\"2号楼\",\"businessKey\":\"123123\",\"valuePrice\":\"123123\"}",
+        resBody="{'code':0,'msg':'成功'}"
+)
+
 /**
  * 类表述：保存
  * 服务编码：supplierCoupon.saveSupplierCoupon
@@ -52,13 +86,15 @@ public class SaveSupplierCouponCmd extends Cmd {
     @Autowired
     private ISupplierCouponV1InnerServiceSMO supplierCouponV1InnerServiceSMOImpl;
 
+    @Autowired
+    private ISupplierV1InnerServiceSMO supplierV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "name", "请求报文中未包含name");
-Assert.hasKeyAndValue(reqJson, "supplierId", "请求报文中未包含supplierId");
-Assert.hasKeyAndValue(reqJson, "supplierName", "请求报文中未包含supplierName");
-Assert.hasKeyAndValue(reqJson, "businessKey", "请求报文中未包含businessKey");
-Assert.hasKeyAndValue(reqJson, "valuePrice", "请求报文中未包含valuePrice");
+        Assert.hasKeyAndValue(reqJson, "supplierId", "请求报文中未包含supplierId");
+        Assert.hasKeyAndValue(reqJson, "businessKey", "请求报文中未包含businessKey");
+        Assert.hasKeyAndValue(reqJson, "valuePrice", "请求报文中未包含valuePrice");
 
     }
 
@@ -66,7 +102,14 @@ Assert.hasKeyAndValue(reqJson, "valuePrice", "请求报文中未包含valuePrice
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       SupplierCouponPo supplierCouponPo = BeanConvertUtil.covertBean(reqJson, SupplierCouponPo.class);
+        SupplierDto supplierDto = new SupplierDto();
+        supplierDto.setSupplierId(reqJson.getString("supplierId"));
+        List<SupplierDto> supplierDtos = supplierV1InnerServiceSMOImpl.querySuppliers(supplierDto);
+
+        Assert.listOnlyOne(supplierDtos,"请先添加供应商");
+
+        SupplierCouponPo supplierCouponPo = BeanConvertUtil.covertBean(reqJson, SupplierCouponPo.class);
+        supplierCouponPo.setSupplierName(supplierDtos.get(0).getSupplierName());
         supplierCouponPo.setCouponId(GenerateCodeFactory.getGeneratorId(CODE_PREFIX_ID));
         int flag = supplierCouponV1InnerServiceSMOImpl.saveSupplierCoupon(supplierCouponPo);
 

service-acct/src/main/java/com/java110/acct/cmd/supplierCoupon/UpdateSupplierCouponCmd.java

@@ -22,7 +22,10 @@ import com.java110.core.context.ICmdDataFlowContext;
 import com.java110.core.event.cmd.Cmd;
 import com.java110.core.event.cmd.CmdEvent;
 import com.java110.core.factory.GenerateCodeFactory;
+import com.java110.doc.annotation.*;
+import com.java110.dto.supplier.SupplierDto;
 import com.java110.intf.acct.ISupplierCouponV1InnerServiceSMO;
+import com.java110.intf.scm.ISupplierV1InnerServiceSMO;
 import com.java110.po.supplierCoupon.SupplierCouponPo;
 import com.java110.utils.exception.CmdException;
 import com.java110.utils.util.Assert;
@@ -32,7 +35,38 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
 
+
+
+@Java110CmdDoc(title = "修改供应商优惠券",
+        description = "用于外系统修改供应商优惠券",
+        httpMethod = "post",
+        url = "http://{ip}:{port}/app/supplierCoupon.updateSupplierCoupon",
+        resource = "acctDoc",
+        author = "吴学文",
+        serviceCode = "supplierCoupon.saveSupplierCoupon"
+)
+
+@Java110ParamsDoc(params = {
+        @Java110ParamDoc(name = "couponId", length = 30, remark = "优惠券ID"),
+        @Java110ParamDoc(name = "supplierId", length = 30, remark = "供应商ID"),
+        @Java110ParamDoc(name = "name", length = 64, remark = "名称"),
+        @Java110ParamDoc(name = "businessKey", length = 64, remark = "优惠券业务ID，第三方ID"),
+        @Java110ParamDoc(name = "valuePrice", length = 64, remark = "售价")
+})
+
+@Java110ResponseDoc(
+        params = {
+                @Java110ParamDoc(name = "code", type = "int", length = 11, defaultValue = "0", remark = "返回编号，0 成功 其他失败"),
+                @Java110ParamDoc(name = "msg", type = "String", length = 250, defaultValue = "成功", remark = "描述"),
+        }
+)
+
+@Java110ExampleDoc(
+        reqBody="{\"couponId\":\"123123\",\"supplierId\":\"123123\",\"name\":\"2号楼\",\"businessKey\":\"123123\",\"valuePrice\":\"123123\"}",
+        resBody="{'code':0,'msg':'成功'}"
+)
 /**
  * 类表述：更新
  * 服务编码：supplierCoupon.updateSupplierCoupon
@@ -46,16 +80,20 @@ import org.slf4j.LoggerFactory;
 @Java110Cmd(serviceCode = "supplierCoupon.updateSupplierCoupon")
 public class UpdateSupplierCouponCmd extends Cmd {
 
-  private static Logger logger = LoggerFactory.getLogger(UpdateSupplierCouponCmd.class);
+    private static Logger logger = LoggerFactory.getLogger(UpdateSupplierCouponCmd.class);
 
 
     @Autowired
     private ISupplierCouponV1InnerServiceSMO supplierCouponV1InnerServiceSMOImpl;
 
+
+    @Autowired
+    private ISupplierV1InnerServiceSMO supplierV1InnerServiceSMOImpl;
+
     @Override
     public void validate(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) {
         Assert.hasKeyAndValue(reqJson, "couponId", "couponId不能为空");
-Assert.hasKeyAndValue(reqJson, "supplierId", "supplierId不能为空");
+        Assert.hasKeyAndValue(reqJson, "supplierId", "supplierId不能为空");
 
     }
 
@@ -63,7 +101,14 @@ Assert.hasKeyAndValue(reqJson, "supplierId", "supplierId不能为空");
     @Java110Transactional
     public void doCmd(CmdEvent event, ICmdDataFlowContext cmdDataFlowContext, JSONObject reqJson) throws CmdException {
 
-       SupplierCouponPo supplierCouponPo = BeanConvertUtil.covertBean(reqJson, SupplierCouponPo.class);
+        SupplierDto supplierDto = new SupplierDto();
+        supplierDto.setSupplierId(reqJson.getString("supplierId"));
+        List<SupplierDto> supplierDtos = supplierV1InnerServiceSMOImpl.querySuppliers(supplierDto);
+
+        Assert.listOnlyOne(supplierDtos,"请先添加供应商");
+
+        SupplierCouponPo supplierCouponPo = BeanConvertUtil.covertBean(reqJson, SupplierCouponPo.class);
+        supplierCouponPo.setSupplierName(supplierDtos.get(0).getSupplierName());
         int flag = supplierCouponV1InnerServiceSMOImpl.updateSupplierCoupon(supplierCouponPo);
 
         if (flag < 1) {