diff --git a/jsowell-admin/src/main/resources/application-dev.yml b/jsowell-admin/src/main/resources/application-dev.yml index 9e16f48e4..246bc3293 100644 --- a/jsowell-admin/src/main/resources/application-dev.yml +++ b/jsowell-admin/src/main/resources/application-dev.yml @@ -36,10 +36,10 @@ spring: druid: # 主库数据源 master: -# url: jdbc:mysql://192.168.2.46:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 -# username: jsowell_dev - url: jdbc:mysql://192.168.2.46:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: jsowell_prd_copy + url: jdbc:mysql://192.168.2.46:3306/jsowell_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: jsowell_dev +# url: jdbc:mysql://192.168.2.46:3306/jsowell_prd_copy?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: jsowell_prd_copy password: 123456 # 从库数据源 slave: diff --git a/jsowell-admin/src/main/resources/application-pre.yml b/jsowell-admin/src/main/resources/application-pre.yml index 0920d81b6..8c3a8c0a0 100644 --- a/jsowell-admin/src/main/resources/application-pre.yml +++ b/jsowell-admin/src/main/resources/application-pre.yml @@ -14,7 +14,7 @@ spring: # 数据库索引 database: 0 # 账号 - #username: root +# username: root # 密码 password: js160829 # 连接超时时间 diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/domain/shareprofit/ShareprofitGroup.java b/jsowell-pile/src/main/java/com/jsowell/pile/domain/shareprofit/ShareprofitGroup.java new file mode 100644 index 000000000..f1dc4c04c --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/domain/shareprofit/ShareprofitGroup.java @@ -0,0 +1,159 @@ +package com.jsowell.pile.domain.shareprofit; + +import com.jsowell.common.annotation.Excel; +import com.jsowell.common.core.domain.BaseEntity; +import org.apache.commons.lang3.builder.ToStringBuilder; +import org.apache.commons.lang3.builder.ToStringStyle; + +/** + * 运营商分润组对象 shareprofit_group + * + * @author jsowell + * @date 2024-09-12 + */ +public class ShareprofitGroup extends BaseEntity { + private static final long serialVersionUID = 1L; + + /** + * 主键 + */ + private Long id; + + /** + * 分润组编号 + */ + @Excel(name = "分润组编号") + private String groupCode; + + /** + * 运营商id + */ + @Excel(name = "运营商id") + private Long merchantId; + + /** + * 站点id + */ + @Excel(name = "站点id") + private Long stationId; + + /** + * 分润成员手机号码 + */ + @Excel(name = "分润成员手机号码") + private String memberPhoneNumber; + + /** + * 电费分润比例 + */ + @Excel(name = "电费分润比例") + private String electricityFeeScale; + + /** + * 服务费分润比例 + */ + @Excel(name = "服务费分润比例") + private String serviceFeeScale; + + /** + * 是否承担手续费(0-否;1-是) + */ + @Excel(name = "是否承担手续费(0-否;1-是)") + private String undertakeHandlingCharge; + + /** + * 删除标识(0-否;1-是) + */ + private String delFlag; + + public void setId(Long id) { + this.id = id; + } + + public Long getId() { + return id; + } + + public void setGroupCode(String groupCode) { + this.groupCode = groupCode; + } + + public String getGroupCode() { + return groupCode; + } + + public void setMerchantId(Long merchantId) { + this.merchantId = merchantId; + } + + public Long getMerchantId() { + return merchantId; + } + + public void setStationId(Long stationId) { + this.stationId = stationId; + } + + public Long getStationId() { + return stationId; + } + + public void setMemberPhoneNumber(String memberPhoneNumber) { + this.memberPhoneNumber = memberPhoneNumber; + } + + public String getMemberPhoneNumber() { + return memberPhoneNumber; + } + + public void setElectricityFeeScale(String electricityFeeScale) { + this.electricityFeeScale = electricityFeeScale; + } + + public String getElectricityFeeScale() { + return electricityFeeScale; + } + + public void setServiceFeeScale(String serviceFeeScale) { + this.serviceFeeScale = serviceFeeScale; + } + + public String getServiceFeeScale() { + return serviceFeeScale; + } + + public void setUndertakeHandlingCharge(String undertakeHandlingCharge) { + this.undertakeHandlingCharge = undertakeHandlingCharge; + } + + public String getUndertakeHandlingCharge() { + return undertakeHandlingCharge; + } + + public void setDelFlag(String delFlag) { + this.delFlag = delFlag; + } + + public String getDelFlag() { + return delFlag; + } + + @Override + public String toString() { + return new ToStringBuilder(this, ToStringStyle.JSON_STYLE) + .append("id", getId()) + .append("groupCode", getGroupCode()) + .append("merchantId", getMerchantId()) + .append("stationId", getStationId()) + .append("memberPhoneNumber", getMemberPhoneNumber()) + .append("electricityFeeScale", getElectricityFeeScale()) + .append("serviceFeeScale", getServiceFeeScale()) + .append("undertakeHandlingCharge", getUndertakeHandlingCharge()) + .append("createTime", getCreateTime()) + .append("createBy", getCreateBy()) + .append("updateTime", getUpdateTime()) + .append("updateBy", getUpdateBy()) + .append("delFlag", getDelFlag()) + .toString(); + } +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitGroupMapper.java b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitGroupMapper.java new file mode 100644 index 000000000..fa12ec584 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/mapper/ShareprofitGroupMapper.java @@ -0,0 +1,63 @@ +package com.jsowell.pile.mapper; + +import java.util.List; + +import com.jsowell.pile.domain.shareprofit.ShareprofitGroup; +import org.springframework.stereotype.Repository; + +/** + * 运营商分润组Mapper接口 + * + * @author jsowell + * @date 2024-09-12 + */ +@Repository +public interface ShareprofitGroupMapper { + /** + * 查询运营商分润组 + * + * @param id 运营商分润组主键 + * @return 运营商分润组 + */ + public ShareprofitGroup selectShareprofitGroupById(Long id); + + /** + * 查询运营商分润组列表 + * + * @param shareprofitGroup 运营商分润组 + * @return 运营商分润组集合 + */ + public List selectShareprofitGroupList(ShareprofitGroup shareprofitGroup); + + /** + * 新增运营商分润组 + * + * @param shareprofitGroup 运营商分润组 + * @return 结果 + */ + public int insertShareprofitGroup(ShareprofitGroup shareprofitGroup); + + /** + * 修改运营商分润组 + * + * @param shareprofitGroup 运营商分润组 + * @return 结果 + */ + public int updateShareprofitGroup(ShareprofitGroup shareprofitGroup); + + /** + * 删除运营商分润组 + * + * @param id 运营商分润组主键 + * @return 结果 + */ + public int deleteShareprofitGroupById(Long id); + + /** + * 批量删除运营商分润组 + * + * @param ids 需要删除的数据主键集合 + * @return 结果 + */ + public int deleteShareprofitGroupByIds(Long[] ids); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitGroupService.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitGroupService.java new file mode 100644 index 000000000..bd0d459ab --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/IShareprofitGroupService.java @@ -0,0 +1,61 @@ +package com.jsowell.pile.service; + +import java.util.List; + +import com.jsowell.pile.domain.shareprofit.ShareprofitGroup; + +/** + * 运营商分润组Service接口 + * + * @author jsowell + * @date 2024-09-12 + */ +public interface IShareprofitGroupService { + /** + * 查询运营商分润组 + * + * @param id 运营商分润组主键 + * @return 运营商分润组 + */ + public ShareprofitGroup selectShareprofitGroupById(Long id); + + /** + * 查询运营商分润组列表 + * + * @param shareprofitGroup 运营商分润组 + * @return 运营商分润组集合 + */ + public List selectShareprofitGroupList(ShareprofitGroup shareprofitGroup); + + /** + * 新增运营商分润组 + * + * @param shareprofitGroup 运营商分润组 + * @return 结果 + */ + public int insertShareprofitGroup(ShareprofitGroup shareprofitGroup); + + /** + * 修改运营商分润组 + * + * @param shareprofitGroup 运营商分润组 + * @return 结果 + */ + public int updateShareprofitGroup(ShareprofitGroup shareprofitGroup); + + /** + * 批量删除运营商分润组 + * + * @param ids 需要删除的运营商分润组主键集合 + * @return 结果 + */ + public int deleteShareprofitGroupByIds(Long[] ids); + + /** + * 删除运营商分润组信息 + * + * @param id 运营商分润组主键 + * @return 结果 + */ + public int deleteShareprofitGroupById(Long id); +} diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitGroupServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitGroupServiceImpl.java new file mode 100644 index 000000000..739ab7a72 --- /dev/null +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/ShareprofitGroupServiceImpl.java @@ -0,0 +1,90 @@ +package com.jsowell.pile.service.impl; + +import java.util.List; + +import com.jsowell.common.util.DateUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import com.jsowell.pile.mapper.ShareprofitGroupMapper; +import com.jsowell.pile.domain.shareprofit.ShareprofitGroup; +import com.jsowell.pile.service.IShareprofitGroupService; + +/** + * 运营商分润组Service业务层处理 + * + * @author jsowell + * @date 2024-09-12 + */ +@Service +public class ShareprofitGroupServiceImpl implements IShareprofitGroupService { + @Autowired + private ShareprofitGroupMapper shareprofitGroupMapper; + + /** + * 查询运营商分润组 + * + * @param id 运营商分润组主键 + * @return 运营商分润组 + */ + @Override + public ShareprofitGroup selectShareprofitGroupById(Long id) { + return shareprofitGroupMapper.selectShareprofitGroupById(id); + } + + /** + * 查询运营商分润组列表 + * + * @param shareprofitGroup 运营商分润组 + * @return 运营商分润组 + */ + @Override + public List selectShareprofitGroupList(ShareprofitGroup shareprofitGroup) { + return shareprofitGroupMapper.selectShareprofitGroupList(shareprofitGroup); + } + + /** + * 新增运营商分润组 + * + * @param shareprofitGroup 运营商分润组 + * @return 结果 + */ + @Override + public int insertShareprofitGroup(ShareprofitGroup shareprofitGroup) { + shareprofitGroup.setCreateTime(DateUtils.getNowDate()); + return shareprofitGroupMapper.insertShareprofitGroup(shareprofitGroup); + } + + /** + * 修改运营商分润组 + * + * @param shareprofitGroup 运营商分润组 + * @return 结果 + */ + @Override + public int updateShareprofitGroup(ShareprofitGroup shareprofitGroup) { + shareprofitGroup.setUpdateTime(DateUtils.getNowDate()); + return shareprofitGroupMapper.updateShareprofitGroup(shareprofitGroup); + } + + /** + * 批量删除运营商分润组 + * + * @param ids 需要删除的运营商分润组主键 + * @return 结果 + */ + @Override + public int deleteShareprofitGroupByIds(Long[] ids) { + return shareprofitGroupMapper.deleteShareprofitGroupByIds(ids); + } + + /** + * 删除运营商分润组信息 + * + * @param id 运营商分润组主键 + * @return 结果 + */ + @Override + public int deleteShareprofitGroupById(Long id) { + return shareprofitGroupMapper.deleteShareprofitGroupById(id); + } +} diff --git a/jsowell-pile/src/main/resources/mapper/pile/ShareprofitGroupMapper.xml b/jsowell-pile/src/main/resources/mapper/pile/ShareprofitGroupMapper.xml new file mode 100644 index 000000000..d272ff081 --- /dev/null +++ b/jsowell-pile/src/main/resources/mapper/pile/ShareprofitGroupMapper.xml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + select id, group_code, merchant_id, station_id, member_phone_number, electricity_fee_scale, service_fee_scale, undertake_handling_charge, create_time, create_by, update_time, update_by, del_flag from shareprofit_group + + + + + + + + insert into shareprofit_group + + group_code, + merchant_id, + station_id, + member_phone_number, + electricity_fee_scale, + service_fee_scale, + undertake_handling_charge, + create_time, + create_by, + update_time, + update_by, + del_flag, + + + #{groupCode}, + #{merchantId}, + #{stationId}, + #{memberPhoneNumber}, + #{electricityFeeScale}, + #{serviceFeeScale}, + #{undertakeHandlingCharge}, + #{createTime}, + #{createBy}, + #{updateTime}, + #{updateBy}, + #{delFlag}, + + + + + update shareprofit_group + + group_code = #{groupCode}, + merchant_id = #{merchantId}, + station_id = #{stationId}, + member_phone_number = #{memberPhoneNumber}, + electricity_fee_scale = #{electricityFeeScale}, + service_fee_scale = #{serviceFeeScale}, + undertake_handling_charge = #{undertakeHandlingCharge}, + create_time = #{createTime}, + create_by = #{createBy}, + update_time = #{updateTime}, + update_by = #{updateBy}, + del_flag = #{delFlag}, + + where id = #{id} + + + + delete from shareprofit_group where id = #{id} + + + + delete from shareprofit_group where id in + + #{id} + + + \ No newline at end of file