diff --git a/client/src/main/java/com/small/client/dao/BaseDao.java b/client/src/main/java/com/small/client/dao/BaseDao.java index d4d6c26e..68643583 100644 --- a/client/src/main/java/com/small/client/dao/BaseDao.java +++ b/client/src/main/java/com/small/client/dao/BaseDao.java @@ -182,6 +182,33 @@ public class BaseDao { return total; } + public Integer getTotalSpecShop(String ip, String username, String password,Integer portNumber, String dataBaseName,String where){ + int total=0; + Connection connection=getConnection(ip,username,password,portNumber,dataBaseName); + try { + String sql="select count(1) from t_pub_plan_detail_b d left join t_pub_plan_master m on " + + " d.plan_no =m.plan_no %s"; + sql=String.format(sql,where); + log.info(sql); + PreparedStatement ps= connection.prepareStatement(sql); + ResultSet rs=ps.executeQuery(); + while (rs.next()){ + total=rs.getInt(1); + } + } catch (SQLException e) { + log.info("数据库查询异常方法{},异常信息{}","com.suisung.mall.shop.sixun.dao.BaseDao.getBaseTotal",e.getMessage()); + throw new RuntimeException(e); + } + finally { + try { + connection.close(); + } catch (SQLException e) { + throw new RuntimeException(e); + } + } + return total; + } + public Integer getVipBaseTotal(String ip, String username, String password,Integer portNumber, String dataBaseName, String table,String where){ int total=0; Connection connection=getConnection(ip,username,password,portNumber,dataBaseName); diff --git a/client/src/main/java/com/small/client/dto/ActiveDto.java b/client/src/main/java/com/small/client/dto/ActiveDto.java index 6dbb5820..a0787fa9 100644 --- a/client/src/main/java/com/small/client/dto/ActiveDto.java +++ b/client/src/main/java/com/small/client/dto/ActiveDto.java @@ -17,6 +17,9 @@ public class ActiveDto implements Serializable { @ApiModelProperty(value = "活动名称") private String activityName; + @ApiModelProperty(value = "活动说明") + private String activity_remark; + @ApiModelProperty(value = "活动类型 1秒杀;2单件折扣,3满减") private Integer activityTypeId;