企业中心接口优化

src/main/java/cn/timer/api/bean/qyzx/businessService/QyzxUseRecord.java

@@ -4,7 +4,7 @@
  * @author dsc  
  * @author dsc  
  * @date 2020年4月21日  
  * @date 2020年4月21日  
  * @version 1.0  
  * @version 1.0  
- */  
+ */
 package cn.timer.api.bean.qyzx.businessService;
 package cn.timer.api.bean.qyzx.businessService;
 
 
 import java.util.Date;
 import java.util.Date;
@@ -27,12 +27,17 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import lombok.NoArgsConstructor;
 
 
-/**  
- * <p>Title: QyzxUseRecord.java</p>  
- * <p>Description: 使用记录表实体类</p>  
- * @author dsc  
- * @date 2020年4月21日  
- * @version 1.0  
+/**
+ * <p>
+ * Title: QyzxUseRecord.java
+ * </p>
+ * <p>
+ * Description: 使用记录表实体类
+ * </p>
+ * 
+ * @author dsc
+ * @date 2020年4月21日
+ * @version 1.0
  */
  */
 
 
 @Entity
 @Entity
@@ -40,46 +45,49 @@ import lombok.NoArgsConstructor;
 @Builder
 @Builder
 @AllArgsConstructor
 @AllArgsConstructor
 @NoArgsConstructor
 @NoArgsConstructor
-@Table(name="qyzx_use_record")
+@Table(name = "qyzx_use_record")
 @ApiModel("使用记录表")
 @ApiModel("使用记录表")
-public class QyzxUseRecord extends Model<QyzxUseRecord>{
+public class QyzxUseRecord extends Model<QyzxUseRecord> {
 
 
 	private static final long serialVersionUID = 8623518557970200924L;
 	private static final long serialVersionUID = 8623518557970200924L;
 
 
 	@Id
 	@Id
 	@GeneratedValue
 	@GeneratedValue
-	@TableId (type = IdType.AUTO)
-	@ApiModelProperty(value="主键",example="1")
+	@TableId(type = IdType.AUTO)
+	@ApiModelProperty(value = "主键", example = "1")
 	private Integer id;
 	private Integer id;
-	
-	@ApiModelProperty(value="模块id 0-无 1-短信 2-电子合同 3-系统续费",example="1")
-    private Integer pmid;
-	
-	@ApiModelProperty(value="订单号",example="1")
-    private String orderNo;
-	
-	@ApiModelProperty(value="使用场景",example="1")
-    private String scene;
-	
-	@ApiModelProperty(value="使用数量",example="1")
-    private Integer useNum;
-	
-	@ApiModelProperty(value="原始总量",example="500")
-    private Integer originalTotalNum;
-	
-	@ApiModelProperty(value="当前总量",example="499")
-    private Integer nowTotalNum;
-	
-	@ApiModelProperty(value="是否删除",example="默认0-未删除，1-删除")
-    private Integer isDelete;
+
+	@ApiModelProperty(value = "模块id 0-无 1-短信 2-电子合同 3-系统续费", example = "1")
+	private Integer pmid;
+
+	@ApiModelProperty(value = "企业id", example = "117")
+	private Integer orgCode;
+
+	@ApiModelProperty(value = "订单号", example = "1")
+	private String orderNo;
+
+	@ApiModelProperty(value = "使用场景", example = "1")
+	private String scene;
+
+	@ApiModelProperty(value = "使用数量", example = "1")
+	private Integer useNum;
+
+	@ApiModelProperty(value = "原始总量", example = "500")
+	private Integer originalTotalNum;
+
+	@ApiModelProperty(value = "当前总量", example = "499")
+	private Integer nowTotalNum;
+
+	@ApiModelProperty(value = "是否删除", example = "默认0-未删除，1-删除")
+	private Integer isDelete;
 
 
 	@TableField(fill = FieldFill.INSERT)
 	@TableField(fill = FieldFill.INSERT)
-	@ApiModelProperty(value="创建时间 ",example="")
+	@ApiModelProperty(value = "创建时间 ", example = "")
 	private Date createTime;
 	private Date createTime;
 
 
-	@ApiModelProperty(value="创建人 ",example="")
+	@ApiModelProperty(value = "创建人 ", example = "")
 	private String createUser;
 	private String createUser;
-	
-	@ApiModelProperty(value="使用人手机号 ",example="")
+
+	@ApiModelProperty(value = "使用人手机号 ", example = "")
 	private String userPhone;
 	private String userPhone;
 }
 }

src/main/java/cn/timer/api/controller/qyzx/QyzxBusinessController.java

@@ -294,8 +294,8 @@ public class QyzxBusinessController {
 	@GetMapping(value = "/queryMsgUseRecord")
 	@GetMapping(value = "/queryMsgUseRecord")
 	@ApiOperation(value = "查询短信使用记录", httpMethod = "GET", notes = "接口发布说明")
 	@ApiOperation(value = "查询短信使用记录", httpMethod = "GET", notes = "接口发布说明")
 	public Result<List<QyzxUseRecord>> queryMsgUseRecord(@CurrentUser UserBean userBean, String orderNo) {
 	public Result<List<QyzxUseRecord>> queryMsgUseRecord(@CurrentUser UserBean userBean, String orderNo) {
-		return ResultUtil.data(
-				QyzxUseRecord.builder().build().selectList(new LambdaQueryWrapper<QyzxUseRecord>()
+		return ResultUtil.data(QyzxUseRecord.builder().build()
+				.selectList(new LambdaQueryWrapper<QyzxUseRecord>().eq(QyzxUseRecord::getOrgCode, userBean.getOrgCode())
 						.eq(QyzxUseRecord::getPmid, 1).eq(orderNo != null, QyzxUseRecord::getOrderNo, orderNo)),
 						.eq(QyzxUseRecord::getPmid, 1).eq(orderNo != null, QyzxUseRecord::getOrderNo, orderNo)),
 				"查询成功");
 				"查询成功");
 	}
 	}

src/main/java/cn/timer/api/utils/aliyun/AliyunSMS.java

@@ -162,6 +162,7 @@ public class AliyunSMS {
 				qyzxUseRecord.setUseNum(1);
 				qyzxUseRecord.setUseNum(1);
 				qyzxUseRecord.setPmid(quantity.getPmid());
 				qyzxUseRecord.setPmid(quantity.getPmid());
 				qyzxUseRecord.setCreateUser("System");
 				qyzxUseRecord.setCreateUser("System");
+				qyzxUseRecord.setOrgCode(orgCode);
 				qyzxUseRecord.insert();
 				qyzxUseRecord.insert();
 
 
 				id = qyzxUseRecord.getId();
 				id = qyzxUseRecord.getId();
@@ -283,6 +284,7 @@ public class AliyunSMS {
 			qyzxUseRecord.setScene(QyzxScene.MSG_REMIND.getMessage());
 			qyzxUseRecord.setScene(QyzxScene.MSG_REMIND.getMessage());
 			qyzxUseRecord.setUseNum(1);
 			qyzxUseRecord.setUseNum(1);
 			qyzxUseRecord.setPmid(quantity.getPmid());
 			qyzxUseRecord.setPmid(quantity.getPmid());
+			qyzxUseRecord.setOrgCode(orgCode);
 			qyzxUseRecord.insert();
 			qyzxUseRecord.insert();
 
 
 			quantity.setRemainder(remainder);
 			quantity.setRemainder(remainder);