Skip to content

G
gic-platform-enterprise
Commit f7c2c05e by 陶光胜
Options

Merge branch 'developer' into 'master' 

Developer

See merge request !4
parents 3e140c2f 983d54a8
Showing with 2988 additions and 338 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/Constants.java
......@@ -59,29 +59,24 @@ public interface Constants {
*/
String TODO_ITEM_AUDIT = "audit";
/**
* 账户余额不足
* 产品通知
*/
String TODO_ITEM_ACCOUNT_BALANCE = "account_balance";
/**
* 门店分组
*/
String TODO_ITEM_STORE_GROUP = "store_group";
String PRODUCT = "product";
// -----------------------待办事项跳转url-------------------------------
/**
* 审批的url
*/
String TODO_ITEM_AUDIT_URL = "/damo-system/user/approve";
String TODO_ITEM_AUDIT_URL = "damo-system/user/approve";
/**
* 商户余额欠费
*/
String TODO_ITEM_ACCOUNT_BALANCE_URL = "/billing-center/recharge";
String TODO_ITEM_ACCOUNT_BALANCE_URL = "billing-center/recharge";
/**
* 门店分组
*/
String TODO_ITEM_STORE_GROUP_URL = "/damo-store/shop-management/shop-group-management";
String TODO_ITEM_STORE_GROUP_URL = "damo-store/shop-management/shop-group-management";
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/MallModeEnum.java
......@@ -9,7 +9,7 @@ package com.gic.enterprise.constant;
*/
public enum MallModeEnum {
MICRO_MALL(1, "微商城模式"),
SMART_RETAIL(1, "智慧零售模式"),
SMART_RETAIL(2, "智慧零售模式"),
;
private int code;
......@@ -32,6 +32,23 @@ public enum MallModeEnum {
return false;
}
/**
* 与微盟code进行匹配 0 微盟微商城 1 微盟智慧零售
* @Title: mapToWm

* @Description:

* @author guojuxing
* @param code

* @return int


*/
public static int mapToWm(Integer code) {
if (code.intValue() == 1) {
return 0;
} else if (code.intValue() == 2) {
return 1;
}
return 0;
}
public int getCode() {
return code;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/WmStoreConfigTypeEnum.java
......@@ -8,15 +8,20 @@ package com.gic.enterprise.constant;
* @date 2019/11/25 2:42 PM

*/
public enum WmStoreConfigTypeEnum {
MEMBER_CARD_CONFIG(1, "会员卡配置"),
COUPON_CONFIG(2, "卡券配置"),
ORDER_CONFIG(3, "订单配置"),
INTEGRAL_CONFIG(4, "积分配置"),
GOODS_CONFIG(5, "商品配置"),
APPLET_CONFIG(6, "小程序配置");
MEMBER_CARD_CONFIG(1, "会员卡配置", true),
COUPON_CONFIG(2, "卡券配置", true),
ORDER_CONFIG(3, "订单配置", true),
GOODS_CONFIG(4, "商品配置", true),
INTEGRAL_CONFIG(5, "积分配置", false),
STORE_CLERK_CONFIG(6, "门店导购同步", false);
private int code;
private String message;
/**
* 是否是需要保存在tab_wm_store_config的数据
* 其他数据需要额外表
*/
private boolean hasConfigData;
/**
* 是否是枚举内的code值
......@@ -28,7 +33,7 @@ public enum WmStoreConfigTypeEnum {
return false;
}
for (WmStoreConfigTypeEnum typeEnum : values()) {
if (code.intValue() == typeEnum.getCode()) {
if (typeEnum.hasConfigData && code.intValue() == typeEnum.getCode()) {
return true;
}
}
......@@ -46,9 +51,10 @@ public enum WmStoreConfigTypeEnum {
return "--";
}
private WmStoreConfigTypeEnum(int code, String message) {
private WmStoreConfigTypeEnum(int code, String message, boolean hasConfigData) {
this.code = code;
this.message = message;
this.hasConfigData = hasConfigData;
}
public int getCode() {
......@@ -67,4 +73,12 @@ public enum WmStoreConfigTypeEnum {
this.message = message;
}
public boolean isHasConfigData() {
return hasConfigData;
}
public WmStoreConfigTypeEnum setHasConfigData(boolean hasConfigData) {
this.hasConfigData = hasConfigData;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AppletQrcodeDTO.java 0 → 100644
package com.gic.enterprise.dto;
import java.io.Serializable;
import java.util.Date;
/**
* tab_applet_qrcode
*/
public class AppletQrcodeDTO implements Serializable {
/**
*
*/
private Integer id;
/**
*
*/
private String path;
/**
*
*/
private String params;
/**
*
*/
private Integer enterpriseId;
/**
*
*/
private String appid;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public String getParams() {
return params;
}
public void setParams(String params) {
this.params = params;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getAppid() {
return appid;
}
public void setAppid(String appid) {
this.appid = appid;
}
}
\ No newline at end of file
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/AuditRiskModeDTO.java
......@@ -12,6 +12,7 @@ public class AuditRiskModeDTO extends AuditLogDTO {
private Integer duration;
private Integer auditDuration;
private String applyReason;
private String applyReasonName;
public Integer getDuration() {
return duration;
......@@ -36,4 +37,12 @@ public class AuditRiskModeDTO extends AuditLogDTO {
public void setApplyReason(String applyReason) {
this.applyReason = applyReason;
}
public void setApplyDurationName(String applyReasonName) {
this.applyReasonName = applyReasonName;
}
public String getApplyReasonName() {
return applyReasonName;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/BillingSmsRecordDTO.java
package com.gic.enterprise.dto;
import java.io.Serializable;
import java.util.Date;
/**
* tab_billing_sms_record
*/
public class BillingSmsRecordDTO {
public class BillingSmsRecordDTO implements Serializable {
/**
*
*/
private Integer smsRecordId;
private Long smsRecordId;
/**
*
......@@ -111,11 +112,11 @@ public class BillingSmsRecordDTO {
*/
private String storeGroupName;
public Integer getSmsRecordId() {
public Long getSmsRecordId() {
return smsRecordId;
}
public void setSmsRecordId(Integer smsRecordId) {
public void setSmsRecordId(Long smsRecordId) {
this.smsRecordId = smsRecordId;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/ProjectItemDTO.java
package com.gic.enterprise.dto;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.io.Serializable;
import java.util.Date;
......@@ -14,9 +12,6 @@ import java.util.Date;
public class ProjectItemDTO implements Serializable {
private static final long serialVersionUID = -394928332987419164L;
public interface SaveValid{
}
/**
*
......@@ -26,36 +21,30 @@ public class ProjectItemDTO implements Serializable {
/**
* 审批项名称
*/
@NotBlank(message = "审批项名称不能为空", groups = SaveValid.class)
private String projectItemName;
/**
* 审批项code
*/
@NotBlank(message = "审批项code不能为空", groups = SaveValid.class)
private String projectItemCode;
/**
* 审批项描述
*/
@NotBlank(message = "审批项描述不能为空", groups = SaveValid.class)
private String projectItemDesc;
/**
* 项目id
*/
@NotNull(message = "项目id不能为空", groups = SaveValid.class)
private Integer projectId;
/**
* 回调地址
*/
@NotBlank(message = "回调地址不能为空", groups = SaveValid.class)
private String callbackUrl;
/**
* 使用状态 1:可用 0：禁用
*/
@NotNull(message = "使用状态不能为空", groups = SaveValid.class)
private Integer useStatus;
/**
......@@ -68,19 +57,16 @@ public class ProjectItemDTO implements Serializable {
*/
private Date updateTime;
@NotBlank(message = "是否为平台项目不能为空", groups = SaveValid.class)
private Integer isPlatform;
/**
* 审核截止时长 单位：天
*/
@NotNull(message = "审核截止时间不能为空", groups = SaveValid.class)
private Integer auditExpireDuration;
/**
* 审批模板类型 0：普通审批项， 1：风险模式审批， 2：导出完整数据
*/
@NotNull(message = "审批模板类型不能为空", groups = SaveValid.class)
private Integer auditTemplateType;
public Integer getProjectItemId() {
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/SmsRecordDTO.java
......@@ -106,7 +106,7 @@ public class SmsRecordDTO implements Serializable {
/**
* 会员ecuId
*/
@NotNull(message = "会员ecuId不能为空", groups = SmsRecordValid.class)
// @NotNull(message = "会员ecuId不能为空", groups = SmsRecordValid.class)
private Long ecuId;
/**
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/TodoItemDTO.java
......@@ -77,6 +77,16 @@ public class TodoItemDTO implements Serializable {
@NotBlank(message = "url不能为空", groups = SaveValidView.class)
private String itemInfoUrl;
private String itemTypeName;
public void setItemTypeName(String itemTypeName) {
this.itemTypeName = itemTypeName;
}
public String getItemTypeName() {
return itemTypeName;
}
public Integer getTodoItemId() {
return todoItemId;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/WmStoreDTO.java
......@@ -44,6 +44,16 @@ public class WmStoreDTO implements Serializable{
private String wmPidName;
/**
* 会员小程序ID
*/
private String memberWechat;
/**
* 微盟小程序APPID
*/
private String wmAppid;
/**
* 商城模式 1:微商城模式 2:智慧零售模式
*/
private Integer mallMode;
......@@ -180,4 +190,22 @@ public class WmStoreDTO implements Serializable{
this.updateTime = updateTime;
return this;
}
public String getMemberWechat() {
return memberWechat;
}
public WmStoreDTO setMemberWechat(String memberWechat) {
this.memberWechat = memberWechat;
return this;
}
public String getWmAppid() {
return wmAppid;
}
public WmStoreDTO setWmAppid(String wmAppid) {
this.wmAppid = wmAppid;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataGenerationConfigDTO.java 0 → 100644
package com.gic.enterprise.dto.data;
import java.io.Serializable;
import java.util.Date;
public class DataGenerationConfigDTO implements Serializable{
private static final long serialVersionUID = 6372096709629738302L;
/**
*
*/
private Integer generationConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 档位 1:第一档 2:第二档...
*/
private Integer ageLevel;
/**
* 第一个区间符号 1:小于等于 2:小于 3:大于等于 4:大于
*/
private Integer firstSign;
/**
* 第一个区间值
*/
private Integer ageFirstValue;
/**
* 第二个区间符号 1:小于等于 2:小于 3:大于等于 4:大于不一定有值（第一档和最后一档没有值）
*/
private Integer secondSign;
/**
* 第二个区间值，不一定有值（第一档和最后一档没有值）
*/
private Integer ageSecondValue;
/**
* 展示名称
*/
private String description;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getGenerationConfigId() {
return generationConfigId;
}
public DataGenerationConfigDTO setGenerationConfigId(Integer generationConfigId) {
this.generationConfigId = generationConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public DataGenerationConfigDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getAgeLevel() {
return ageLevel;
}
public DataGenerationConfigDTO setAgeLevel(Integer ageLevel) {
this.ageLevel = ageLevel;
return this;
}
public Integer getFirstSign() {
return firstSign;
}
public DataGenerationConfigDTO setFirstSign(Integer firstSign) {
this.firstSign = firstSign;
return this;
}
public Integer getAgeFirstValue() {
return ageFirstValue;
}
public DataGenerationConfigDTO setAgeFirstValue(Integer ageFirstValue) {
this.ageFirstValue = ageFirstValue;
return this;
}
public Integer getSecondSign() {
return secondSign;
}
public DataGenerationConfigDTO setSecondSign(Integer secondSign) {
this.secondSign = secondSign;
return this;
}
public Integer getAgeSecondValue() {
return ageSecondValue;
}
public DataGenerationConfigDTO setAgeSecondValue(Integer ageSecondValue) {
this.ageSecondValue = ageSecondValue;
return this;
}
public String getDescription() {
return description;
}
public DataGenerationConfigDTO setDescription(String description) {
this.description = description;
return this;
}
public Integer getStatus() {
return status;
}
public DataGenerationConfigDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public DataGenerationConfigDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public DataGenerationConfigDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataMemberConsumeConfigDTO.java
......@@ -28,14 +28,24 @@ public class DataMemberConsumeConfigDTO implements Serializable{
private Integer memberConsumeCount;
/**
* 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
* 默认订单粒度。最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
*/
private Integer memberConsumeMax;
private Integer memberConsumeMaxDefault;
/**
* 消费次数 1:消费单次数』2:『有效消费次数』
* 默认订单粒度。消费次数 1:消费单次数』2:『有效消费次数』
*/
private Integer memberConsumeTimes;
private Integer memberConsumeTimesDefault;
/**
* 订单粒度(统计到商品品牌)。最高单笔配置 1:最高ERP单笔应付』 2:『最高有效单笔应付』
*/
private Integer memberConsumeMaxGoods;
/**
* 订单粒度(统计到商品品牌)。消费次数 1:消费单次数』'
*/
private Integer memberConsumeTimesGoods;
/**
* 1:有效
......@@ -79,21 +89,39 @@ public class DataMemberConsumeConfigDTO implements Serializable{
return this;
}
public Integer getMemberConsumeMax() {
return memberConsumeMax;
public Integer getMemberConsumeMaxDefault() {
return memberConsumeMaxDefault;
}
public DataMemberConsumeConfigDTO setMemberConsumeMaxDefault(Integer memberConsumeMaxDefault) {
this.memberConsumeMaxDefault = memberConsumeMaxDefault;
return this;
}
public Integer getMemberConsumeTimesDefault() {
return memberConsumeTimesDefault;
}
public DataMemberConsumeConfigDTO setMemberConsumeTimesDefault(Integer memberConsumeTimesDefault) {
this.memberConsumeTimesDefault = memberConsumeTimesDefault;
return this;
}
public Integer getMemberConsumeMaxGoods() {
return memberConsumeMaxGoods;
}
public DataMemberConsumeConfigDTO setMemberConsumeMax(Integer memberConsumeMax) {
this.memberConsumeMax = memberConsumeMax;
public DataMemberConsumeConfigDTO setMemberConsumeMaxGoods(Integer memberConsumeMaxGoods) {
this.memberConsumeMaxGoods = memberConsumeMaxGoods;
return this;
}
public Integer getMemberConsumeTimes() {
return memberConsumeTimes;
public Integer getMemberConsumeTimesGoods() {
return memberConsumeTimesGoods;
}
public DataMemberConsumeConfigDTO setMemberConsumeTimes(Integer memberConsumeTimes) {
this.memberConsumeTimes = memberConsumeTimes;
public DataMemberConsumeConfigDTO setMemberConsumeTimesGoods(Integer memberConsumeTimesGoods) {
this.memberConsumeTimesGoods = memberConsumeTimesGoods;
return this;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/data/DataSingleEffectConfigDTO.java
......@@ -24,6 +24,11 @@ public class DataSingleEffectConfigDTO implements Serializable{
private Integer enterpriseId;
/**
* 订单粒度 1:订单粒度（默认） 2:订单粒度（统计到商品品牌）
*/
private Integer orderGrain;
/**
* 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
*/
private Integer sale;
......@@ -152,4 +157,13 @@ public class DataSingleEffectConfigDTO implements Serializable{
this.updateTime = updateTime;
return this;
}
public Integer getOrderGrain() {
return orderGrain;
}
public DataSingleEffectConfigDTO setOrderGrain(Integer orderGrain) {
this.orderGrain = orderGrain;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmCouponDTO.java 0 → 100644
package com.gic.enterprise.dto.wm;
import java.io.Serializable;
public class WmCouponDTO implements Serializable{
private static final long serialVersionUID = -6461391431608411393L;
/**
* 微盟卡券ID
*/
private Long wmCouponId;
/**
* 店铺主键
*/
private Integer wmMallStoreId;
public Long getWmCouponId() {
return wmCouponId;
}
public WmCouponDTO setWmCouponId(Long wmCouponId) {
this.wmCouponId = wmCouponId;
return this;
}
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public WmCouponDTO setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmMemberCardConfigDTO.java 0 → 100644
package com.gic.enterprise.dto.wm;
import java.io.Serializable;
/**
* 微盟店铺会员卡配置
* @ClassName: WmMemberCardConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/4/30 4:06 PM

*/
public class WmMemberCardConfigDTO implements Serializable{
private static final long serialVersionUID = 3646796243951200869L;
/**
* 开卡方式 1:达摩开卡 2:微盟开卡
*/
private Integer openCardMode;
/**
* GIC会员归属信息同步微盟 1:开启 0:关闭
*/
private Integer gicMemberToWm;
/**
* //微盟会员导购关系同步GIC 1:开启 0:关闭
*/
private Integer wmMemberClerkToGic;
/**
* 微盟会员信息（包括门店关系）同步GIC 1:开启 0:关闭
*/
private Integer wmMemberToGic;
public Integer getOpenCardMode() {
return openCardMode;
}
public WmMemberCardConfigDTO setOpenCardMode(Integer openCardMode) {
this.openCardMode = openCardMode;
return this;
}
public Integer getGicMemberToWm() {
return gicMemberToWm;
}
public WmMemberCardConfigDTO setGicMemberToWm(Integer gicMemberToWm) {
this.gicMemberToWm = gicMemberToWm;
return this;
}
public Integer getWmMemberClerkToGic() {
return wmMemberClerkToGic;
}
public WmMemberCardConfigDTO setWmMemberClerkToGic(Integer wmMemberClerkToGic) {
this.wmMemberClerkToGic = wmMemberClerkToGic;
return this;
}
public Integer getWmMemberToGic() {
return wmMemberToGic;
}
public WmMemberCardConfigDTO setWmMemberToGic(Integer wmMemberToGic) {
this.wmMemberToGic = wmMemberToGic;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmOrderConfigDTO.java 0 → 100644
package com.gic.enterprise.dto.wm;
import java.io.Serializable;
/**
* 微盟店铺订单配置
* @ClassName: WmOrderConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/4/30 4:09 PM

*/
public class WmOrderConfigDTO implements Serializable{
private static final long serialVersionUID = 6885339139181658360L;
/**
* 微盟订单是否进入了线下订单系统（例如ERP） 1:是 0:不是
*/
private Integer wmOrderToOffline;
/**
* //在线下订单系统是否可以区分出微盟订单 1:是 0:否
*/
private Integer offlineDifferentiateWm;
/**
* 订单获取方案 1:从微盟获取订单 2:从ERP获取订单
*/
private Integer orderFromMode;
public Integer getWmOrderToOffline() {
return wmOrderToOffline;
}
public WmOrderConfigDTO setWmOrderToOffline(Integer wmOrderToOffline) {
this.wmOrderToOffline = wmOrderToOffline;
return this;
}
public Integer getOfflineDifferentiateWm() {
return offlineDifferentiateWm;
}
public WmOrderConfigDTO setOfflineDifferentiateWm(Integer offlineDifferentiateWm) {
this.offlineDifferentiateWm = offlineDifferentiateWm;
return this;
}
public Integer getOrderFromMode() {
return orderFromMode;
}
public WmOrderConfigDTO setOrderFromMode(Integer orderFromMode) {
this.orderFromMode = orderFromMode;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmStoreConfigDTO.java
......@@ -24,9 +24,9 @@ public class WmStoreConfigDTO implements Serializable{
private Integer enterpriseId;
/**
* 微盟主账号(平台唯一)，用于关联配置
* 店铺主键ID，用于关联配置
*/
private String wmMainAccount;
private Integer wmMallStoreId;
/**
* 店铺配置类型 1:会员卡配置 2:卡券配置 3:订单配置 4:积分配置 5:商品同步记录 6:小程序配置
......@@ -71,12 +71,12 @@ public class WmStoreConfigDTO implements Serializable{
return this;
}
public String getWmMainAccount() {
return wmMainAccount;
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public WmStoreConfigDTO setWmMainAccount(String wmMainAccount) {
this.wmMainAccount = wmMainAccount;
public WmStoreConfigDTO setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/wm/WmStoreCouponConfigDTO.java 0 → 100644
package com.gic.enterprise.dto.wm;
import java.io.Serializable;
import java.util.Date;
/**
* 微盟店铺卡券配置
* @ClassName: WmStoreCouponConfigDTO

* @Description: 

* @author guojuxing

* @date 2020/5/7 10:42 AM

*/
public class WmStoreCouponConfigDTO implements Serializable{
private static final long serialVersionUID = 452619999926042472L;
/**
*
*/
private Integer couponConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 店铺主键ID，用于关联配置
*/
private Integer wmMallStoreId;
/**
* gic卡券id
*/
private String gicCouponId;
/**
* gic卡券名称
*/
private String gicCouponName;
/**
* 微盟卡券ID
*/
private String wmCouponId;
/**
* 微盟卡券名称
*/
private String wmCouponName;
/**
* gic卡券过期时间，如果是固定时间，则有值，如果未null，说明有效
*/
private Date gicCouponExpire;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getCouponConfigId() {
return couponConfigId;
}
public WmStoreCouponConfigDTO setCouponConfigId(Integer couponConfigId) {
this.couponConfigId = couponConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public WmStoreCouponConfigDTO setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public WmStoreCouponConfigDTO setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
public String getGicCouponId() {
return gicCouponId;
}
public WmStoreCouponConfigDTO setGicCouponId(String gicCouponId) {
this.gicCouponId = gicCouponId;
return this;
}
public String getWmCouponId() {
return wmCouponId;
}
public WmStoreCouponConfigDTO setWmCouponId(String wmCouponId) {
this.wmCouponId = wmCouponId;
return this;
}
public Date getGicCouponExpire() {
return gicCouponExpire;
}
public WmStoreCouponConfigDTO setGicCouponExpire(Date gicCouponExpire) {
this.gicCouponExpire = gicCouponExpire;
return this;
}
public Integer getStatus() {
return status;
}
public WmStoreCouponConfigDTO setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public WmStoreCouponConfigDTO setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public WmStoreCouponConfigDTO setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
public String getGicCouponName() {
return gicCouponName;
}
public WmStoreCouponConfigDTO setGicCouponName(String gicCouponName) {
this.gicCouponName = gicCouponName;
return this;
}
public String getWmCouponName() {
return wmCouponName;
}
public WmStoreCouponConfigDTO setWmCouponName(String wmCouponName) {
this.wmCouponName = wmCouponName;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/AppletServiceConfigQO.java
package com.gic.enterprise.qo;
import java.util.List;
/**
*
* @Description:
......@@ -18,6 +20,7 @@ public class AppletServiceConfigQO extends PageQO {
private Integer type;
private Integer pageNum;
private String orderBy;
private List<Long> appIdList;
public Integer getSortColumn() {
return sortColumn;
......@@ -74,4 +77,12 @@ public class AppletServiceConfigQO extends PageQO {
public String getOrderBy() {
return orderBy;
}
public List<Long> getAppIdList() {
return appIdList;
}
public void setConfigIdList(List<Long> appIdList) {
this.appIdList = appIdList;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/BillListQueryQO.java
......@@ -23,6 +23,11 @@ public class BillListQueryQO extends PageQO{
private Integer enterpriseId;
/**
* 流水号 支付流水号/订单流水号
*/
private String serialNumber;
public String getStartTime() {
return startTime;
}
......@@ -62,4 +67,13 @@ public class BillListQueryQO extends PageQO{
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
public String getSerialNumber() {
return serialNumber;
}
public BillListQueryQO setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/ProjectItemQO.java
package com.gic.enterprise.qo;
import com.gic.enterprise.dto.ProjectItemDTO;
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.NotNull;
import java.util.Date;
import java.util.List;
/**
......@@ -17,80 +12,49 @@ public class ProjectItemQO extends PageQO {
private static final long serialVersionUID = 1218293562538399805L;
public interface SaveValid{
}
public interface DelValid{
}
public interface ListValid{
}
/**
*
*/
@NotNull(message = "审批项id不能为空", groups = {DelValid.class})
private Integer projectItemId;
/**
* 审批项名称
*/
@org.hibernate.validator.constraints.NotBlank(message = "审批项名称不能为空", groups = {SaveValid.class})
private String projectItemName;
@NotBlank(message = "审批项code不能为空", groups = ProjectItemDTO.SaveValid.class)
private String projectItemCode;
/**
* 审批项描述
*/
@org.hibernate.validator.constraints.NotBlank(message = "审批项描述不能为空", groups = {SaveValid.class})
private String projectItemDesc;
/**
* 项目id
*/
@NotNull(message = "项目id不能为空", groups = {SaveValid.class, ListValid.class})
private Integer projectId;
/**
* 回调地址
*/
@org.hibernate.validator.constraints.NotBlank(message = "回调地址不能为空", groups = {SaveValid.class})
private String callbackUrl;
/**
* 使用状态 1:可用 0：禁用
*/
@NotNull(message = "使用状态不能为空", groups = {SaveValid.class})
private Integer useStatus;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
private String search;
@NotBlank(message = "是否为平台项目不能为空", groups = ProjectItemDTO.SaveValid.class)
private Integer isPlatform;
/**
* 审核截止时长 单位：天
*/
@NotNull(message = "审核截止时间不能为空", groups = ProjectItemDTO.SaveValid.class)
private Integer auditExpireDuration;
/**
* 审批模板类型 0：普通审批项， 1：风险模式审批， 2：导出完整数据
*/
@NotNull(message = "审批模板类型不能为空", groups = ProjectItemDTO.SaveValid.class)
private Integer auditTemplateType;
private List<Integer> projectItemList;
......@@ -151,22 +115,6 @@ public class ProjectItemQO extends PageQO {
this.useStatus = useStatus;
}
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 String getSearch() {
return search;
}
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/ProjectQO.java
......@@ -12,13 +12,7 @@ import javax.validation.constraints.NotNull;
public class ProjectQO extends PageQO {
private static final long serialVersionUID = -3584081588337122486L;
public interface SaveValid {}
public interface DelValid {}
@NotNull(message = "项目id不能为空", groups = DelValid.class)
private Integer projectId;
@org.hibernate.validator.constraints.NotBlank(message = "项目名称不能为空", groups = SaveValid.class)
private String projectName;
public Integer getProjectId() {
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/RechargeRecordQO.java
......@@ -23,6 +23,11 @@ public class RechargeRecordQO extends PageQO {
private Integer auditStatus;
/**
* 流水号
*/
private String serialNumber;
public Integer getEnterpriseId() {
return enterpriseId;
}
......@@ -62,4 +67,13 @@ public class RechargeRecordQO extends PageQO {
public void setAuditStatus(Integer auditStatus) {
this.auditStatus = auditStatus;
}
public String getSerialNumber() {
return serialNumber;
}
public RechargeRecordQO setSerialNumber(String serialNumber) {
this.serialNumber = serialNumber;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/wm/CouponConfigQO.java 0 → 100644
package com.gic.enterprise.qo.wm;
import com.gic.enterprise.qo.PageQO;
import java.io.Serializable;
/**
* 卡券配置查询参数
* @ClassName: CouponConfigQO

* @Description: 

* @author guojuxing

* @date 2020/5/7 11:04 AM

*/
public class CouponConfigQO extends PageQO implements Serializable{
private static final long serialVersionUID = 2703515379512499369L;
/**
* 店铺主键ID，用于关联配置
*/
private Integer wmMallStoreId;
/**
* gic卡券ID
*/
private String gicCouponId;
/**
* 微盟卡券ID
*/
private String wmCouponId;
/**
* 仅展示有效卡券 1：是
*/
private Integer onlyShowEffective;
/**
* 卡券名称
*/
private String couponName;
/**
* 1：绑定时间正序 2：绑定时间倒叙
*/
private Integer orderByCode;
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public CouponConfigQO setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
public String getGicCouponId() {
return gicCouponId;
}
public CouponConfigQO setGicCouponId(String gicCouponId) {
this.gicCouponId = gicCouponId;
return this;
}
public String getWmCouponId() {
return wmCouponId;
}
public CouponConfigQO setWmCouponId(String wmCouponId) {
this.wmCouponId = wmCouponId;
return this;
}
public Integer getOnlyShowEffective() {
return onlyShowEffective;
}
public CouponConfigQO setOnlyShowEffective(Integer onlyShowEffective) {
this.onlyShowEffective = onlyShowEffective;
return this;
}
public String getCouponName() {
return couponName;
}
public CouponConfigQO setCouponName(String couponName) {
this.couponName = couponName;
return this;
}
public Integer getOrderByCode() {
return orderByCode;
}
public CouponConfigQO setOrderByCode(Integer orderByCode) {
this.orderByCode = orderByCode;
return this;
}
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/AppletQrcodeApiService.java 0 → 100644
package com.gic.enterprise.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.AppletQrcodeDTO;
import java.util.Map;
public interface AppletQrcodeApiService {
ServiceResponse<Map<String, Object>> takeAppletQrcode(Integer enterpriseId, String appid, String path, String params);
ServiceResponse<AppletQrcodeDTO> getAppletQrcode(Integer id);
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/BillingOrderApiService.java
......@@ -26,7 +26,7 @@ public interface BillingOrderApiService {
*/
ServiceResponse<Integer> saveSmsOrderBuyNow(BillingOrderDTO billingOrderDTO, SmsPackageOrderItemDTO smsPackageOrderItemDTO);
ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType, String authCode);
ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType, String authCode, String userName);
/**
* 条件分页查询订单状态
......
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/CallBackApiService.java
......@@ -18,4 +18,6 @@ public interface CallBackApiService {
* @return
*/
ServiceResponse<Void> weChatCallBack(String params, String openid, Integer type);
ServiceResponse<Void> weChatCallBack(String json);
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/DataConfigApiService.java
package com.gic.enterprise.service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.dto.data.*;
import java.util.List;
......@@ -19,9 +16,27 @@ public interface DataConfigApiService {

*/
ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto);
/**
* 会员消费配置信息
* @Title: getMemberConsumeConfigByEnterpriseId

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO>


*/
ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId);
/**
* 新增商户初始化会员消费配置
* @Title: initMemberConsumeConfig

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> initMemberConsumeConfig(Integer enterpriseId);
/**
* 新增
* @Title: configActuallyPaid

* @Description:
......@@ -31,6 +46,14 @@ public interface DataConfigApiService {

*/
ServiceResponse<Void> configActuallyPaid(List<DataActuallyPaidConfigDTO> dtoList);
/**
* 实付配置信息
* @Title: listActuallyPaidConfig

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO>>


*/
ServiceResponse<List<DataActuallyPaidConfigDTO>> listActuallyPaidConfig(Integer enterpriseId);
/**
......@@ -48,10 +71,10 @@ public interface DataConfigApiService {
* @Title: configSingleEffect

* @Description:

* @author guojuxing
* @param dto

* @param dtoList
* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> configSingleEffect(DataSingleEffectConfigDTO dto);
ServiceResponse<Void> configSingleEffect(List<DataSingleEffectConfigDTO> dtoList);
/**
* 获取单效取值配置
......@@ -61,7 +84,7 @@ public interface DataConfigApiService {
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.data.DataSingleEffectConfigDTO>


*/
ServiceResponse<DataSingleEffectConfigDTO> getSingleEffectConfig(Integer enterpriseId);
ServiceResponse<List<DataSingleEffectConfigDTO>> getSingleEffectConfig(Integer enterpriseId);
/**
* 新增商户的时候设置单效取值配置默认数据
......@@ -103,4 +126,34 @@ public interface DataConfigApiService {

*/
ServiceResponse<Void> initPerformanceConfig(Integer enterpriseId);
/**
* 年龄段配置
* @Title: saveGenerationConfig

* @Description:

* @author guojuxing
* @param dtoList

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> saveGenerationConfig(List<DataGenerationConfigDTO> dtoList);
/**
* 查询年龄段配置信息
* @Title: listGenerationConfig

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.enterprise.dto.data.DataGenerationConfigDTO>>


*/
ServiceResponse<List<DataGenerationConfigDTO>> listGenerationConfig(Integer enterpriseId);
/**
* 新增商户初始化年龄段配置数据
* @Title: initGenerationConfig

* @Description:

* @author guojuxing
* @param enterpriseId

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> initGenerationConfig(Integer enterpriseId);
}
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/WmStoreApiService.java
package com.gic.enterprise.service;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.WmMemberCardConfigDTO;
import com.gic.enterprise.dto.WmOrderConfigDTO;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.dto.wm.WmCouponDTO;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import java.util.List;
import java.util.Map;
import java.util.Set;
/**
* 微盟商城店铺
......@@ -62,13 +68,73 @@ public interface WmStoreApiService {
ServiceResponse<Integer> saveOrUpdateWmStoreConfig(WmStoreConfigDTO dto);
/**
* 获取会员卡配置信息
* @Title: getMemberCardConfig

* @Description:

* @author guojuxing
* @param wmMallStoreId
店铺主键
* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.WmMemberCardConfigDTO>


*/
ServiceResponse<WmMemberCardConfigDTO> getMemberCardConfig(Integer wmMallStoreId);
/**
* 获取订单配置
* @Title: getOrderConfig

* @Description:

* @author guojuxing
* @param wmMallStoreId

* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.WmOrderConfigDTO>


*/
ServiceResponse<WmOrderConfigDTO> getOrderConfig(Integer wmMallStoreId);
/**
* 根据微盟主账号查询配置
* @Title: getWmStoreConfigByWmMainAccount

* @Title: getWmStoreConfig

* @Description:

* @author guojuxing
* @param wmMainAccount

* @param wmStoreConfigType 店铺配置类型 1:会员卡配置 2:卡券配置 3:订单配置 4:积分配置 5:商品同步记录 6:小程序配置 WmStoreConfigTypeEnum枚举类
* @param wmMallStoreId 店铺主键ID

* @param wmStoreConfigType 店铺配置类型 WmStoreConfigTypeEnum 枚举类
* @return com.gic.api.base.commons.ServiceResponse<com.gic.enterprise.dto.wm.WmStoreConfigDTO>


*/
ServiceResponse<WmStoreConfigDTO> getWmStoreConfigByWmMainAccount(String wmMainAccount, Integer wmStoreConfigType);
ServiceResponse<WmStoreConfigDTO> getWmStoreConfig(Integer wmMallStoreId, Integer wmStoreConfigType);
/**
* 查询店铺配置 key : 配置类型 WmStoreConfigTypeEnum 枚举类
* @Title: getWmStoreConfigKey

* @Description:

* @author guojuxing
* @param wmMallStoreId 店铺主键ID

* @return com.gic.api.base.commons.ServiceResponse<java.util.Set<String>>


*/
ServiceResponse<Set<String>> getWmStoreConfigKey(Integer wmMallStoreId);
/**
* 绑定卡券
* @Title: saveCouponConfig

* @Description:

* @author guojuxing
* @param dto

* @return com.gic.api.base.commons.ServiceResponse<java.lang.Void>


*/
ServiceResponse<Void> saveCouponConfig(WmStoreCouponConfigDTO dto);
/**
* 根据gic查询微盟绑定的卡券ID
* @Title: getWmCouponId

* @Description:

* @author guojuxing
* @param couponId
* @return com.gic.enterprise.dto.wm.WmCouponDTO

*/
ServiceResponse<List<WmCouponDTO>> getWmCouponId(Long couponId);
/**
* 分页查询卡券绑定记录
* @Title: pageCouponConfig

* @Description:

* @author guojuxing
* @param params

* @return com.gic.api.base.commons.ServiceResponse<com.gic.api.base.commons.Page<com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO>>


*/
ServiceResponse<Page<WmStoreCouponConfigDTO>> pageCouponConfig(CouponConfigQO params);
}
gic-platform-enterprise-service/pom.xml
......@@ -191,6 +191,11 @@
<artifactId>gic-log-api</artifactId>
<version>${gic-log-api}</version>
</dependency>
<dependency>
<groupId>com.gic</groupId>
<artifactId>gic-thirdparty-sdk</artifactId>
<version>${gic-thirdparty-sdk}</version>
</dependency>
</dependencies>
<build>
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabAppletQrcodeMapper.java 0 → 100644
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabAppletQrcode;
public interface TabAppletQrcodeMapper {
/**
* 根据主键删除
*
* @param id 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer id);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabAppletQrcode record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabAppletQrcode record);
/**
* 根据主键查询
*
* @param id 主键
* @return 实体对象
*/
TabAppletQrcode selectByPrimaryKey(Integer id);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabAppletQrcode record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabAppletQrcode record);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabDataGenerationConfigMapper.java 0 → 100644
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataGenerationConfig;
import java.util.List;
public interface TabDataGenerationConfigMapper {
/**
* 根据主键删除
*
* @param generationConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer generationConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabDataGenerationConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabDataGenerationConfig record);
/**
* 根据主键查询
*
* @param generationConfigId 主键
* @return 实体对象
*/
TabDataGenerationConfig selectByPrimaryKey(Integer generationConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabDataGenerationConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabDataGenerationConfig record);
void deleteGenerationConfig(Integer enterpriseId);
List<TabDataGenerationConfig> listGenerationByEnterpriseId(Integer enterpriseId);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabDataSingleEffectConfigMapper.java
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabDataSingleEffectConfig;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TabDataSingleEffectConfigMapper {
/**
......@@ -51,5 +54,7 @@ public interface TabDataSingleEffectConfigMapper {
*/
int updateByPrimaryKey(TabDataSingleEffectConfig record);
TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId);
List<TabDataSingleEffectConfig> getByEnterpriseId(Integer enterpriseId);
void deleteSingleEffectConfig(@Param("enterpriseId") Integer enterpriseId, @Param("orderGrain") Integer orderGrain);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabWmStoreConfigMapper.java
......@@ -3,6 +3,8 @@ package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabWmStoreConfig;
import org.apache.ibatis.annotations.Param;
import java.util.List;
public interface TabWmStoreConfigMapper {
/**
* 根据主键删除
......@@ -52,5 +54,7 @@ public interface TabWmStoreConfigMapper {
*/
int updateByPrimaryKey(TabWmStoreConfig record);
TabWmStoreConfig getByWmMainAccount(@Param("wmMainAccount") String wmMainAccount, @Param("storeConfigType") Integer storeConfigType);
TabWmStoreConfig getWmStoreConfig(@Param("wmMallStoreId") Integer wmMallStoreId, @Param("storeConfigType") Integer storeConfigType);
List<TabWmStoreConfig> listWmStoreConfig(Integer wmMallStoreId);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/dao/mapper/TabWmStoreCouponConfigMapper.java 0 → 100644
package com.gic.enterprise.dao.mapper;
import com.gic.enterprise.entity.TabWmStoreCouponConfig;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import java.util.List;
public interface TabWmStoreCouponConfigMapper {
/**
* 根据主键删除
*
* @param couponConfigId 主键
* @return 更新条目数
*/
int deleteByPrimaryKey(Integer couponConfigId);
/**
* 插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insert(TabWmStoreCouponConfig record);
/**
* 动态插入一条记录
*
* @param record 实体对象
* @return 更新条目数
*/
int insertSelective(TabWmStoreCouponConfig record);
/**
* 根据主键查询
*
* @param couponConfigId 主键
* @return 实体对象
*/
TabWmStoreCouponConfig selectByPrimaryKey(Integer couponConfigId);
/**
* 根据主键动态更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKeySelective(TabWmStoreCouponConfig record);
/**
* 根据主键更新记录
*
* @param record 实体对象
* @return 更新条目数
*/
int updateByPrimaryKey(TabWmStoreCouponConfig record);
List<TabWmStoreCouponConfig> getCouponConfig(CouponConfigQO params);
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletQrcode.java 0 → 100644
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_applet_qrcode
*/
public class TabAppletQrcode {
/**
*
*/
private Integer id;
/**
*
*/
private String path;
/**
*
*/
private String params;
/**
*
*/
private Integer enterpriseId;
/**
*
*/
private String appid;
/**
*
*/
private Date createTime;
public Integer getId() {
return id;
}
public void setId(Integer id) {
this.id = id;
}
public String getPath() {
return path;
}
public void setPath(String path) {
this.path = path;
}
public String getParams() {
return params;
}
public void setParams(String params) {
this.params = params;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public void setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
}
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;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabAppletServiceConfig.java
......@@ -34,6 +34,11 @@ public class TabAppletServiceConfig {
/**
*
*/
private Long configId;
/**
*
*/
private Date createTime;
/**
......@@ -86,6 +91,14 @@ public class TabAppletServiceConfig {
this.type = type;
}
public Long getConfigId() {
return configId;
}
public void setConfigId(Long configId) {
this.configId = configId;
}
public Date getCreateTime() {
return createTime;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataGenerationConfig.java 0 → 100644
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_data_generation_config
*/
public class TabDataGenerationConfig {
/**
*
*/
private Integer generationConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 档位 1:第一档 2:第二档...
*/
private Integer ageLevel;
/**
* 第一个区间符号 1:小于等于 2:小于 3:大于等于 4:大于
*/
private Integer firstSign;
/**
* 第一个区间值
*/
private Integer ageFirstValue;
/**
* 第二个区间符号 1:小于等于 2:小于 3:大于等于 4:大于不一定有值（第一档和最后一档没有值）
*/
private Integer secondSign;
/**
* 第二个区间值，不一定有值（第一档和最后一档没有值）
*/
private Integer ageSecondValue;
/**
* 展示名称
*/
private String description;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getGenerationConfigId() {
return generationConfigId;
}
public TabDataGenerationConfig setGenerationConfigId(Integer generationConfigId) {
this.generationConfigId = generationConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabDataGenerationConfig setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getAgeLevel() {
return ageLevel;
}
public TabDataGenerationConfig setAgeLevel(Integer ageLevel) {
this.ageLevel = ageLevel;
return this;
}
public Integer getFirstSign() {
return firstSign;
}
public TabDataGenerationConfig setFirstSign(Integer firstSign) {
this.firstSign = firstSign;
return this;
}
public Integer getAgeFirstValue() {
return ageFirstValue;
}
public TabDataGenerationConfig setAgeFirstValue(Integer ageFirstValue) {
this.ageFirstValue = ageFirstValue;
return this;
}
public Integer getSecondSign() {
return secondSign;
}
public TabDataGenerationConfig setSecondSign(Integer secondSign) {
this.secondSign = secondSign;
return this;
}
public Integer getAgeSecondValue() {
return ageSecondValue;
}
public TabDataGenerationConfig setAgeSecondValue(Integer ageSecondValue) {
this.ageSecondValue = ageSecondValue;
return this;
}
public String getDescription() {
return description;
}
public TabDataGenerationConfig setDescription(String description) {
this.description = description;
return this;
}
public Integer getStatus() {
return status;
}
public TabDataGenerationConfig setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabDataGenerationConfig setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabDataGenerationConfig setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataMemberConsumeConfig.java
......@@ -22,14 +22,24 @@ public class TabDataMemberConsumeConfig {
private Integer memberConsumeCount;
/**
* 最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
* 默认订单粒度。最高单笔配置 1:最高ERP单笔应付』 2:『最高单笔销售应付』 3:『最高有效单笔应付』 4:『最高成交单笔应付』
*/
private Integer memberConsumeMax;
private Integer memberConsumeMaxDefault;
/**
* 消费次数 1:消费单次数』2:『有效消费次数』
* 默认订单粒度。消费次数 1:消费单次数』2:『有效消费次数』
*/
private Integer memberConsumeTimes;
private Integer memberConsumeTimesDefault;
/**
* 订单粒度(统计到商品品牌)。最高单笔配置 1:最高ERP单笔应付』 2:『最高有效单笔应付』
*/
private Integer memberConsumeMaxGoods;
/**
* 订单粒度(统计到商品品牌)。消费次数 1:消费单次数』'
*/
private Integer memberConsumeTimesGoods;
/**
* 1:有效
......@@ -73,21 +83,39 @@ public class TabDataMemberConsumeConfig {
return this;
}
public Integer getMemberConsumeMax() {
return memberConsumeMax;
public Integer getMemberConsumeMaxDefault() {
return memberConsumeMaxDefault;
}
public TabDataMemberConsumeConfig setMemberConsumeMaxDefault(Integer memberConsumeMaxDefault) {
this.memberConsumeMaxDefault = memberConsumeMaxDefault;
return this;
}
public Integer getMemberConsumeTimesDefault() {
return memberConsumeTimesDefault;
}
public TabDataMemberConsumeConfig setMemberConsumeTimesDefault(Integer memberConsumeTimesDefault) {
this.memberConsumeTimesDefault = memberConsumeTimesDefault;
return this;
}
public Integer getMemberConsumeMaxGoods() {
return memberConsumeMaxGoods;
}
public TabDataMemberConsumeConfig setMemberConsumeMax(Integer memberConsumeMax) {
this.memberConsumeMax = memberConsumeMax;
public TabDataMemberConsumeConfig setMemberConsumeMaxGoods(Integer memberConsumeMaxGoods) {
this.memberConsumeMaxGoods = memberConsumeMaxGoods;
return this;
}
public Integer getMemberConsumeTimes() {
return memberConsumeTimes;
public Integer getMemberConsumeTimesGoods() {
return memberConsumeTimesGoods;
}
public TabDataMemberConsumeConfig setMemberConsumeTimes(Integer memberConsumeTimes) {
this.memberConsumeTimes = memberConsumeTimes;
public TabDataMemberConsumeConfig setMemberConsumeTimesGoods(Integer memberConsumeTimesGoods) {
this.memberConsumeTimesGoods = memberConsumeTimesGoods;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabDataSingleEffectConfig.java
......@@ -17,6 +17,11 @@ public class TabDataSingleEffectConfig {
private Integer enterpriseId;
/**
* 订单粒度 1:订单粒度（默认） 2:订单粒度（统计到商品品牌）
*/
private Integer orderGrain;
/**
* 单效销售额 指标 1:『应付总额』or『实付总额』2:『销售单应付总额』 or『销售单实付总额』 3:有效应付额』 or『有效实付额』
*/
private Integer sale;
......@@ -145,4 +150,13 @@ public class TabDataSingleEffectConfig {
this.updateTime = updateTime;
return this;
}
public Integer getOrderGrain() {
return orderGrain;
}
public TabDataSingleEffectConfig setOrderGrain(Integer orderGrain) {
this.orderGrain = orderGrain;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStore.java
......@@ -37,6 +37,16 @@ public class TabWmStore {
private String wmPidName;
/**
* 会员小程序ID
*/
private String memberWechat;
/**
* 微盟小程序APPID
*/
private String wmAppid;
/**
* 商城模式 1:微商城模式 2:智慧零售模式
*/
private Integer mallMode;
......@@ -173,4 +183,22 @@ public class TabWmStore {
this.updateTime = updateTime;
return this;
}
public String getMemberWechat() {
return memberWechat;
}
public TabWmStore setMemberWechat(String memberWechat) {
this.memberWechat = memberWechat;
return this;
}
public String getWmAppid() {
return wmAppid;
}
public TabWmStore setWmAppid(String wmAppid) {
this.wmAppid = wmAppid;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStoreConfig.java
......@@ -17,9 +17,9 @@ public class TabWmStoreConfig {
private Integer enterpriseId;
/**
* 微盟主账号(平台唯一)，用于关联配置
* 店铺主键ID，用于关联配置
*/
private String wmMainAccount;
private Integer wmMallStoreId;
/**
* 店铺配置类型 1:会员卡配置 2:卡券配置 3:订单配置 4:积分配置 5:商品同步记录 6:小程序配置
......@@ -64,12 +64,12 @@ public class TabWmStoreConfig {
return this;
}
public String getWmMainAccount() {
return wmMainAccount;
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public TabWmStoreConfig setWmMainAccount(String wmMainAccount) {
this.wmMainAccount = wmMainAccount;
public TabWmStoreConfig setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/entity/TabWmStoreCouponConfig.java 0 → 100644
package com.gic.enterprise.entity;
import java.util.Date;
/**
* tab_wm_store_coupon_config
*/
public class TabWmStoreCouponConfig {
/**
*
*/
private Integer couponConfigId;
/**
*
*/
private Integer enterpriseId;
/**
* 店铺主键ID，用于关联配置
*/
private Integer wmMallStoreId;
/**
* gic卡券id
*/
private String gicCouponId;
/**
* gic卡券名称
*/
private String gicCouponName;
/**
* 微盟卡券ID
*/
private String wmCouponId;
/**
* 微盟卡券名称
*/
private String wmCouponName;
/**
* gic卡券过期时间，如果是固定时间，则有值，如果未null，说明有效
*/
private Date gicCouponExpire;
/**
* 1:有效
*/
private Integer status;
/**
*
*/
private Date createTime;
/**
*
*/
private Date updateTime;
public Integer getCouponConfigId() {
return couponConfigId;
}
public TabWmStoreCouponConfig setCouponConfigId(Integer couponConfigId) {
this.couponConfigId = couponConfigId;
return this;
}
public Integer getEnterpriseId() {
return enterpriseId;
}
public TabWmStoreCouponConfig setEnterpriseId(Integer enterpriseId) {
this.enterpriseId = enterpriseId;
return this;
}
public Integer getWmMallStoreId() {
return wmMallStoreId;
}
public TabWmStoreCouponConfig setWmMallStoreId(Integer wmMallStoreId) {
this.wmMallStoreId = wmMallStoreId;
return this;
}
public String getGicCouponId() {
return gicCouponId;
}
public TabWmStoreCouponConfig setGicCouponId(String gicCouponId) {
this.gicCouponId = gicCouponId;
return this;
}
public String getWmCouponId() {
return wmCouponId;
}
public TabWmStoreCouponConfig setWmCouponId(String wmCouponId) {
this.wmCouponId = wmCouponId;
return this;
}
public Date getGicCouponExpire() {
return gicCouponExpire;
}
public TabWmStoreCouponConfig setGicCouponExpire(Date gicCouponExpire) {
this.gicCouponExpire = gicCouponExpire;
return this;
}
public Integer getStatus() {
return status;
}
public TabWmStoreCouponConfig setStatus(Integer status) {
this.status = status;
return this;
}
public Date getCreateTime() {
return createTime;
}
public TabWmStoreCouponConfig setCreateTime(Date createTime) {
this.createTime = createTime;
return this;
}
public Date getUpdateTime() {
return updateTime;
}
public TabWmStoreCouponConfig setUpdateTime(Date updateTime) {
this.updateTime = updateTime;
return this;
}
public String getGicCouponName() {
return gicCouponName;
}
public TabWmStoreCouponConfig setGicCouponName(String gicCouponName) {
this.gicCouponName = gicCouponName;
return this;
}
public String getWmCouponName() {
return wmCouponName;
}
public TabWmStoreCouponConfig setWmCouponName(String wmCouponName) {
this.wmCouponName = wmCouponName;
return this;
}
}
\ No newline at end of file
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/AppletQrcodeService.java 0 → 100644
package com.gic.enterprise.service;
import com.gic.enterprise.entity.TabAppletQrcode;
public interface AppletQrcodeService {
int saveQrcode(TabAppletQrcode tabAppletQrcode);
TabAppletQrcode getQrcode(Integer id);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataGenerationConfigService.java 0 → 100644
package com.gic.enterprise.service;
import com.gic.enterprise.dto.data.DataGenerationConfigDTO;
import com.gic.enterprise.entity.TabDataGenerationConfig;
import java.util.List;
public interface DataGenerationConfigService {
/**
* 新增年龄段配置
* @Title: saveGenerationConfig

* @Description:

* @author guojuxing
* @param dto

* @return void


*/
void saveGenerationConfig(DataGenerationConfigDTO dto);
/**
* 逻辑删除
* @Title: deleteGenerationConfig

* @Description:

* @author guojuxing
* @param enterpriseId
* @return void


*/
void deleteGenerationConfig(Integer enterpriseId);
/**
* 查询年龄段配置数据
* @Title: listGenerationByEnterpriseId

* @Description:

* @author guojuxing
* @param enterpriseId

* @return java.util.List<com.gic.enterprise.entity.TabDataGenerationConfig>


*/
List<TabDataGenerationConfig> listGenerationByEnterpriseId(Integer enterpriseId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/DataSingleEffectConfigService.java
......@@ -3,6 +3,8 @@ package com.gic.enterprise.service;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.entity.TabDataSingleEffectConfig;
import java.util.List;
public interface DataSingleEffectConfigService {
/**
......@@ -25,5 +27,16 @@ public interface DataSingleEffectConfigService {
* @param enterpriseId

* @return com.gic.enterprise.entity.TabDataSingleEffectConfig


*/
TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId);
List<TabDataSingleEffectConfig> getByEnterpriseId(Integer enterpriseId);
/**
* 删除
* @Title: deleteSingleEffectConfig

* @Description:

* @author guojuxing
* @param enterpriseId
* @param orderGrain
订单粒度 1:订单粒度（默认） 2:订单粒度（统计到商品品牌）
* @return void


*/
void deleteSingleEffectConfig(Integer enterpriseId, Integer orderGrain);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/WmStoreConfigService.java
package com.gic.enterprise.service;
import java.util.List;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.entity.TabWmStoreConfig;
......@@ -19,12 +21,14 @@ public interface WmStoreConfigService {
/**
* 根据微盟主账号查询配置
* @Title: getByWmMainAccount

* @Title: getWmStoreConfig

* @Description:

* @author guojuxing
* @param wmMainAccount
* @param storeConfigType
店铺配置类型 1:会员卡配置 2:卡券配置 3:订单配置 4:积分配置 5:商品同步记录 6:小程序配置 WmStoreConfigTypeEnum枚举类
* @param wmMallStoreId 店铺主键ID
* @param storeConfigType
店铺配置类型 WmStoreConfigTypeEnum枚举类
* @return com.gic.enterprise.entity.TabWmStoreConfig


*/
TabWmStoreConfig getByWmMainAccount(String wmMainAccount, Integer storeConfigType);
TabWmStoreConfig getWmStoreConfig(Integer wmMallStoreId, Integer storeConfigType);
List<TabWmStoreConfig> listWmStoreConfig(Integer wmMallStoreId);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/WmStoreCouponConfigService.java 0 → 100644
package com.gic.enterprise.service;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.entity.TabWmStoreCouponConfig;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import com.github.pagehelper.Page;
import java.util.List;
public interface WmStoreCouponConfigService {
/**
* 卡券绑定
* @Title: saveCouponConfig

* @Description:

* @author guojuxing
* @param dto

* @return void


*/
void saveCouponConfig(WmStoreCouponConfigDTO dto);
/**
* 查询卡券配置记录
* @Title: getCouponConfig

* @Description:

* @author guojuxing
* @param params

* @return com.gic.enterprise.entity.TabWmStoreCouponConfig


*/
List<TabWmStoreCouponConfig> getCouponConfig(CouponConfigQO params);
Page<TabWmStoreCouponConfig> pageCouponConfig(CouponConfigQO params);
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AppletQrcodeServiceImpl.java 0 → 100644
package com.gic.enterprise.service.impl;
import com.gic.enterprise.dao.mapper.TabAppletQrcodeMapper;
import com.gic.enterprise.entity.TabAppletQrcode;
import com.gic.enterprise.service.AppletQrcodeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service("appletQrcodeService")
public class AppletQrcodeServiceImpl implements AppletQrcodeService {
@Autowired
private TabAppletQrcodeMapper tabAppletQrcodeMapper;
@Override
public int saveQrcode(TabAppletQrcode tabAppletQrcode) {
tabAppletQrcode.setCreateTime(new Date());
this.tabAppletQrcodeMapper.insertSelective(tabAppletQrcode);
return tabAppletQrcode.getId();
}
@Override
public TabAppletQrcode getQrcode(Integer id) {
return this.tabAppletQrcodeMapper.selectByPrimaryKey(id);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/AppletServiceConfigServiceImpl.java
......@@ -57,6 +57,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
appletServiceConfig.setAppId(e.getAppId());
appletServiceConfig.setName(e.getAppletConfigName());
appletServiceConfig.setType(AppletServiceConfigEnum.APPLET.getCode());
appletServiceConfig.setConfigId(e.getAppletConfigId());
appletServiceConfig.setCreateTime(new Date());
appletServiceConfig.setUpdateTime(new Date());
return appletServiceConfig;
......@@ -78,6 +79,7 @@ public class AppletServiceConfigServiceImpl implements AppletServiceConfigServic
appletServiceConfig.setAppId(e.getAppId());
appletServiceConfig.setName(e.getServiceConfigName());
appletServiceConfig.setType(AppletServiceConfigEnum.SERVICE_CONFIG.getCode());
appletServiceConfig.setConfigId(e.getServiceConfigId());
appletServiceConfig.setCreateTime(new Date());
appletServiceConfig.setUpdateTime(new Date());
return appletServiceConfig;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingAccountServiceImpl.java
......@@ -2,6 +2,7 @@ package com.gic.enterprise.service.impl;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.service.UserApiService;
import com.gic.enterprise.config.Config;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.dao.mapper.TabBillingAccountMapper;
import com.gic.enterprise.entity.TabBillingAccount;
......@@ -28,6 +29,8 @@ public class BillingAccountServiceImpl implements BillingAccountService{
private TodoItemService todoItemService;
@Autowired
private UserApiService userApiService;
@Autowired
private Config config;
@Override
public TabBillingAccount getByEnterpriseId(Integer enterpriseId) {
......@@ -51,7 +54,7 @@ public class BillingAccountServiceImpl implements BillingAccountService{
double newTotal = new BigDecimal(tabBillingAccount.getAccountBalance().toString()).add(new BigDecimal(totalFee + "")).doubleValue();
logger.info("商户：{}, 充值/退款前余额:{}, 充值/退款金额:{}, 充值/退款后余额:{}", enterpriseId, tabBillingAccount.getAccountBalance(), totalFee, newTotal);
UserDTO user = userApiService.getUserByEnterpriseId(enterpriseId).getResult();
todoItemService.finishTodoItem(enterpriseId, user.getUserId(), Constants.TODO_ITEM_ACCOUNT_BALANCE, Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
todoItemService.finishTodoItem(enterpriseId, user.getUserId(), Constants.PRODUCT, config.getHost() + Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
return tabBillingAccountMapper.updateAccountAfterRechargeOrRefund(totalFee, enterpriseId);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingEnterpriseSmsPackageServiceImpl.java
......@@ -77,7 +77,11 @@ public class BillingEnterpriseSmsPackageServiceImpl implements BillingEnterprise
RedisUtil.lock(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT_LOCK + enterpriseId, 30L);
logger.info("redis中没有套餐包 查询数据库:{}", enterpriseId);
Integer totalSms = tabBillingEnterpriseSmsPackageMapper.getTotalSmsInPackageByEnterpriseId(enterpriseId);
smsCountR.set(totalSms);
if (totalSms != null) {
smsCountR.set(totalSms);
} else {
smsCountR.set(0);
}
RedisUtil.unlock(Constants.ENTERPRISE_BILLING_SMS_PACKAGE_COUNT_LOCK + enterpriseId);
}
return smsCountR;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingOrderServiceImpl.java
......@@ -26,7 +26,7 @@ import com.gic.enterprise.service.BillingOrderService;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.github.pagehelper.Page;
@Service
@Service("billingOrderService")
public class BillingOrderServiceImpl implements BillingOrderService {
private Logger logger = LogManager.getLogger(BillingOrderServiceImpl.class);
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingRechargeRecordServiceImpl.java
......@@ -24,7 +24,7 @@ import com.github.pagehelper.PageHelper;
* @author zhiwj
* @date 2019/8/15 17:05
*/
@Service
@Service("billingRechargeRecordService")
public class BillingRechargeRecordServiceImpl implements BillingRechargeRecordService {
@Autowired
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/CustomThemeServiceImpl.java
package com.gic.enterprise.service.impl;
import com.alibaba.fastjson.JSON;
import com.gic.enterprise.dao.mapper.TabCustomThemeMapper;
import com.gic.enterprise.entity.TabCustomTheme;
import com.gic.enterprise.service.CustomThemeService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
......@@ -12,6 +15,7 @@ import java.util.List;
@Service("customThemeService")
public class CustomThemeServiceImpl implements CustomThemeService {
private static final Logger log = LogManager.getLogger(CustomThemeServiceImpl.class);
@Autowired
private TabCustomThemeMapper tabCustomThemeMapper;
......@@ -36,6 +40,7 @@ public class CustomThemeServiceImpl implements CustomThemeService {
@Override
public Integer getTheme(Integer enterpriseId, String appid) {
List<TabCustomTheme> list = this.tabCustomThemeMapper.listTheme(enterpriseId, appid);
log.info("小程序主题：{},{},{}", JSON.toJSONString(list), enterpriseId, appid);
if(CollectionUtils.isNotEmpty(list)){
return list.get(0).getTheme();
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataGenerationConfigServiceImpl.java 0 → 100644
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabDataGenerationConfigMapper;
import com.gic.enterprise.dto.data.DataGenerationConfigDTO;
import com.gic.enterprise.entity.TabDataGenerationConfig;
import com.gic.enterprise.service.DataGenerationConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service("dataGenerationConfigService")
public class DataGenerationConfigServiceImpl implements DataGenerationConfigService{
@Autowired
private TabDataGenerationConfigMapper tabDataGenerationConfigMapper;
@Override
public void saveGenerationConfig(DataGenerationConfigDTO dto) {
Date now = new Date();
dto.setUpdateTime(now);
dto.setCreateTime(now);
dto.setStatus(1);
TabDataGenerationConfig record = EntityUtil.changeEntityNew(TabDataGenerationConfig.class, dto);
tabDataGenerationConfigMapper.insert(record);
}
@Override
public void deleteGenerationConfig(Integer enterpriseId) {
tabDataGenerationConfigMapper.deleteGenerationConfig(enterpriseId);
}
@Override
public List<TabDataGenerationConfig> listGenerationByEnterpriseId(Integer enterpriseId) {
return tabDataGenerationConfigMapper.listGenerationByEnterpriseId(enterpriseId);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/DataSingleEffectConfigServiceImpl.java
......@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service("dataSingleEffectConfigService")
public class DataSingleEffectConfigServiceImpl implements DataSingleEffectConfigService{
......@@ -33,7 +34,12 @@ public class DataSingleEffectConfigServiceImpl implements DataSingleEffectConfig
}
@Override
public TabDataSingleEffectConfig getByEnterpriseId(Integer enterpriseId) {
public List<TabDataSingleEffectConfig> getByEnterpriseId(Integer enterpriseId) {
return tabDataSingleEffectConfigMapper.getByEnterpriseId(enterpriseId);
}
@Override
public void deleteSingleEffectConfig(Integer enterpriseId, Integer orderGrain) {
tabDataSingleEffectConfigMapper.deleteSingleEffectConfig(enterpriseId, orderGrain);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreConfigServiceImpl.java
package com.gic.enterprise.service.impl;
import java.util.Date;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabWmStoreConfigMapper;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.entity.TabWmStoreConfig;
import com.gic.enterprise.service.WmStoreConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
@Service("wmStoreConfigService")
public class WmStoreConfigServiceImpl implements WmStoreConfigService{
......@@ -34,7 +36,13 @@ public class WmStoreConfigServiceImpl implements WmStoreConfigService{
}
@Override
public TabWmStoreConfig getByWmMainAccount(String wmMainAccount, Integer storeConfigType) {
return tabWmStoreConfigMapper.getByWmMainAccount(wmMainAccount, storeConfigType);
public TabWmStoreConfig getWmStoreConfig(Integer wmMallStoreId, Integer storeConfigType) {
return tabWmStoreConfigMapper.getWmStoreConfig(wmMallStoreId, storeConfigType);
}
@Override
public List<TabWmStoreConfig> listWmStoreConfig(Integer wmMallStoreId) {
return tabWmStoreConfigMapper.listWmStoreConfig(wmMallStoreId);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/WmStoreCouponConfigServiceImpl.java 0 → 100644
package com.gic.enterprise.service.impl;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dao.mapper.TabWmStoreCouponConfigMapper;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.entity.TabWmStoreCouponConfig;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import com.gic.enterprise.service.WmStoreCouponConfigService;
import com.github.pagehelper.Page;
import com.github.pagehelper.PageHelper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.Date;
import java.util.List;
@Service("wmStoreCouponConfigService")
public class WmStoreCouponConfigServiceImpl implements WmStoreCouponConfigService{
@Autowired
private TabWmStoreCouponConfigMapper tabWmStoreCouponConfigMapper;
@Override
public void saveCouponConfig(WmStoreCouponConfigDTO dto) {
Date now = new Date();
dto.setCreateTime(now);
dto.setUpdateTime(now);
dto.setStatus(1);
TabWmStoreCouponConfig record = EntityUtil.changeEntityNew(TabWmStoreCouponConfig.class, dto);
tabWmStoreCouponConfigMapper.insert(record);
}
@Override
public List<TabWmStoreCouponConfig> getCouponConfig(CouponConfigQO params) {
return tabWmStoreCouponConfigMapper.getCouponConfig(params);
}
@Override
public Page<TabWmStoreCouponConfig> pageCouponConfig(CouponConfigQO params) {
PageHelper.startPage(params.getCurrentPage(), params.getPageSize());
List<TabWmStoreCouponConfig> list = tabWmStoreCouponConfigMapper.getCouponConfig(params);
return (Page<TabWmStoreCouponConfig>) list;
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletQrcodeApiServiceImpl.java 0 → 100644
package com.gic.enterprise.service.outer.impl;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.dto.AppletQrcodeDTO;
import com.gic.enterprise.entity.TabAppletQrcode;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.AppletQrcodeApiService;
import com.gic.enterprise.service.AppletQrcodeService;
import com.gic.thirdparty.pic.QQCloudPicUtils;
import com.gic.thirdparty.pic.UploadResult;
import com.gic.wechat.business.api.service.wxa.WeixinWxaFunService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.HashMap;
import java.util.Map;
@Service("appletQrcodeApiService")
public class AppletQrcodeApiServiceImpl implements AppletQrcodeApiService {
@Autowired
private AppletQrcodeService appletQrcodeService;
@Autowired
private WeixinWxaFunService weixinWxaFunService;
@Override
public ServiceResponse<Map<String, Object>> takeAppletQrcode(Integer enterpriseId, String appid, String path, String params) {
TabAppletQrcode tabAppletQrcode = new TabAppletQrcode();
tabAppletQrcode.setAppid(appid);
tabAppletQrcode.setEnterpriseId(enterpriseId);
tabAppletQrcode.setPath(path);
tabAppletQrcode.setParams(params);
int i = this.appletQrcodeService.saveQrcode(tabAppletQrcode);
ServiceResponse<Map<String, Object>> wxaQrcode = this.weixinWxaFunService.createWxaQrcode(appid, path, 1280);
if(wxaQrcode.isSuccess()){
Map<String, Object> result = wxaQrcode.getResult();
byte[] contents = (byte[]) result.get("content");
UploadResult uploadResult = QQCloudPicUtils.uploadLocalPicStream("pic01", "", contents);
Map<String, Object> pic = new HashMap<>();
pic.put("fileId", uploadResult.getFileId());
pic.put("url", uploadResult.getUrl());
pic.put("downloadUrl", uploadResult.getDownloadUrl());
pic.put("path", path+"?pageId="+i);
ServiceResponse.success(pic);
}
return ServiceResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "生成小程序二维码异常");
}
@Override
public ServiceResponse<AppletQrcodeDTO> getAppletQrcode(Integer id) {
return null;
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingAccountApiServiceImpl.java
......@@ -6,6 +6,8 @@ import com.gic.auth.service.UserApiService;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.config.Config;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.PackageHoursEnum;
import com.gic.enterprise.constant.PayTypeEnum;
import com.gic.enterprise.constant.billing.AutoRechargeEnum;
import com.gic.enterprise.constant.billing.AutoRechargeRedisConstant;
import com.gic.enterprise.dto.*;
......@@ -15,7 +17,6 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.*;
import com.gic.redis.data.util.RedisUtil;
import org.apache.logging.log4j.core.pattern.AbstractStyleNameConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -48,6 +49,8 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
@Autowired
private UserApiService userApiService;
@Autowired
private BillingOrderApiService billingOrderApiService;
@Autowired
private Config config;
@Override
......@@ -162,8 +165,30 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
Integer preNumber = (Integer) resultMap.get(AutoRechargeRedisConstant.PRE_NUMBER_MAP_KEY);
if (preNumber > getSmsBalanceNumber(enterpriseId)) {
//进行自动扣款
account.setAccountBalance(account.getAccountBalance() - money);
billingAccountService.updateBillingAccount(account);
// account.setAccountBalance(account.getAccountBalance() - money);
// billingAccountService.updateBillingAccount(account);
//生成订单 支付
BillingOrderDTO orderDTO = new BillingOrderDTO();
orderDTO.setEnterpriseId(enterpriseId);
orderDTO.setOrderContent(smsPackageDTO.getSmsPackageName());
orderDTO.setTotalFee(money);
orderDTO.setTotalFeePaid(money);
orderDTO.setPayType(PayTypeEnum.BALANCE_PAY.getCode());
SmsPackageOrderItemDTO itemDTO = new SmsPackageOrderItemDTO();
itemDTO.setBuyCount(1);
itemDTO.setCode(smsPackageDTO.getSmsPackageCode());
itemDTO.setCost(smsPackageDTO.getItemFee());
itemDTO.setPackageLength(12);
itemDTO.setSmsAmount(smsPackageDTO.getItemCount());
for(PackageHoursEnum packageHoursEnum : PackageHoursEnum.values()){
if(packageHoursEnum.getCode() == itemDTO.getPackageLength()){
itemDTO.setPackageHours(packageHoursEnum.getMessage());
}
}
ServiceResponse<Integer> orderResponse = billingOrderApiService.saveSmsOrderBuyNow(orderDTO, itemDTO);
//订购短信套餐包
billingOrderApiService.
paySmsPackageOrder(enterpriseId, orderResponse.getResult(), PayTypeEnum.BALANCE_PAY.getCode(), null, null);
}
}
} else {
......@@ -233,9 +258,9 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
// 事项详情
todoItemDTO.setItemContent("您的GIC商户余额已欠费");
// 事项code 在运维后台字典配置 类目:待办事项类型
todoItemDTO.setItemType(Constants.TODO_ITEM_ACCOUNT_BALANCE);
todoItemDTO.setItemType(Constants.PRODUCT);
// 跳转地址 待办事项点击后要跳转的地址
todoItemDTO.setItemInfoUrl(Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
todoItemDTO.setItemInfoUrl(config.getHost() + Constants.TODO_ITEM_ACCOUNT_BALANCE_URL);
todoItemApiService.saveTodoItem(todoItemDTO);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingOrderApiServcImpl.java
......@@ -8,6 +8,7 @@ import java.util.Date;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
......@@ -39,6 +40,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
private DictApiService dictApiService;
@Autowired
private BillingCouponCardService billingCouponCardService;
@Lazy
@Autowired
private BillingPayInfoApiService billingPayInfoApiService;
@Autowired
......@@ -96,7 +98,8 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
@Override
@Transactional
public ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType, String authCode){
public ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType,
String authCode, String userName){
TabBillingOrder order = this.billingOrderService.getOrderById(orderId);
OutPayDTO outPayDTO = new OutPayDTO();
outPayDTO.setEnterpriseId(enterpriseId);
......@@ -115,6 +118,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
outPayDTO.setOrderSerialNumber(order.getSerialNumber());
outPayDTO.setPayType(payType);
outPayDTO.setAuthCode(authCode);
outPayDTO.setInitiatorName(userName);
ServiceResponse<BillingPayInfoDTO> response = this.billingPayInfoApiService.savePrePayInfo(outPayDTO);
if(response.isSuccess()){
Integer payInfoId = response.getResult().getPayInfoId();
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingPayInfoApiServiceImpl.java
......@@ -126,8 +126,8 @@ public class BillingPayInfoApiServiceImpl implements BillingPayInfoApiService {
@Override
public ServiceResponse<Void> offlineCallBack(String resDataStr) {
logger.info("财务审批回调");
JSONObject jsonObject = JSON.parseObject(resDataStr);
logger.info("财务审批回调:{}", resDataStr);
ApprovalCallBackDTO approvalCallBackDTO = new ApprovalCallBackDTO();
approvalCallBackDTO.setOrderSerialNumber(jsonObject.getString("orderNumber"));
approvalCallBackDTO.setEnterpriseId(jsonObject.getInteger("enterpriseId"));
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingRechargeApiServiceImpl.java
package com.gic.enterprise.service.outer.impl;
import java.util.Map;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.enterprise.constant.BuyTypeEnum;
......@@ -21,10 +12,16 @@ import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.BillingPayInfoApiService;
import com.gic.enterprise.service.BillingRechargeApiService;
import com.gic.enterprise.service.BillingRechargeRecordService;
import com.gic.enterprise.service.EnterpriseService;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.finance.service.TransferAccountsApprovalApiService;
import com.gic.redis.data.util.RedisUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Map;
/**
*
......@@ -40,10 +37,6 @@ public class BillingRechargeApiServiceImpl implements BillingRechargeApiService
private BillingRechargeRecordService billingRechargeRecordService;
@Autowired
private BillingPayInfoApiService billingPayInfoApiService;
@Autowired
private TransferAccountsApprovalApiService transferAccountsApprovalApiService;
@Autowired
private EnterpriseService enterpriseService;
@Override
@Transactional
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/CallBackApiServiceImpl.java
package com.gic.enterprise.service.outer.impl;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.service.AuditorApiService;
import com.gic.enterprise.service.CallBackApiService;
......@@ -28,4 +30,14 @@ public class CallBackApiServiceImpl implements CallBackApiService {
}
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> weChatCallBack(String json) {
logger.info("回调：{}", json);
JSONObject jsonObject = JSON.parseObject(json);
if (jsonObject.getInteger("type") == 1) {
return auditorApiService.receiveOpenid(jsonObject.getString("params"), jsonObject.getString("openid"));
}
return ServiceResponse.success();
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/ConfigRuleEnterpriseApiServiceImpl.java
......@@ -202,7 +202,7 @@ public class ConfigRuleEnterpriseApiServiceImpl implements ConfigRuleEnterpriseA
com.github.pagehelper.Page page = configRuleEnterpriseService.listRule(search, pageNum, pageSize);
Page<RuleEnterpriseDTO> resultPage = PageHelperUtils.changePageHelperToCurrentPage(page);
//
if (pageNum != null && pageNum == 1) {
if (pageNum != null && pageNum == 1 && StringUtils.isBlank(search)) {
//添加默认平台规则
TabConfigRuleEnterpriseRel defaultRule = configRuleEnterpriseService.getByEnterpriseId(-1);
if (defaultRule != null) {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DataConfigApiServiceImpl.java
......@@ -4,20 +4,14 @@ import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;
import com.gic.enterprise.dto.data.*;
import com.gic.enterprise.entity.*;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.dto.data.DataActuallyPaidConfigDTO;
import com.gic.enterprise.dto.data.DataMemberConsumeConfigDTO;
import com.gic.enterprise.dto.data.DataPerformanceConfigDTO;
import com.gic.enterprise.dto.data.DataSingleEffectConfigDTO;
import com.gic.enterprise.entity.TabDataActuallyPaidConfig;
import com.gic.enterprise.entity.TabDataMemberConsumeConfig;
import com.gic.enterprise.entity.TabDataPerformanceConfig;
import com.gic.enterprise.entity.TabDataSingleEffectConfig;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.*;
......@@ -33,6 +27,8 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
private DataSingleEffectConfigService dataSingleEffectConfigService;
@Autowired
private DataPerformanceConfigService dataPerformanceConfigService;
@Autowired
private DataGenerationConfigService dataGenerationConfigService;
@Override
public ServiceResponse<Integer> configMemberConsume(DataMemberConsumeConfigDTO dto) {
......@@ -53,13 +49,23 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
public ServiceResponse<DataMemberConsumeConfigDTO> getMemberConsumeConfigByEnterpriseId(Integer enterpriseId) {
TabDataMemberConsumeConfig record = dataMemberConsumeConfigService.getByEnterpriseId(enterpriseId);
if (record == null) {
//还未配置，新增
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "还未配置会员消费规则");
TabDataMemberConsumeConfig defaultRecord = dataMemberConsumeConfigService.getByEnterpriseId(-1);
return ServiceResponse.success(EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, defaultRecord));
}
return ServiceResponse.success(EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, record));
}
@Override
public ServiceResponse<Void> initMemberConsumeConfig(Integer enterpriseId) {
TabDataMemberConsumeConfig defaultRecord = dataMemberConsumeConfigService.getByEnterpriseId(-1);
DataMemberConsumeConfigDTO dto = EntityUtil.changeEntityNew(DataMemberConsumeConfigDTO.class, defaultRecord);
dto.setMemberConsumeConfigId(null);
dto.setEnterpriseId(enterpriseId);
configMemberConsume(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> configActuallyPaid(List<DataActuallyPaidConfigDTO> dtoList) {
if (CollectionUtils.isEmpty(dtoList)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "实付配置内容为空");
......@@ -96,35 +102,34 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
}
@Override
public ServiceResponse<Void> configSingleEffect(DataSingleEffectConfigDTO dto) {
TabDataSingleEffectConfig record = dataSingleEffectConfigService.getByEnterpriseId(dto.getEnterpriseId());
if (record != null) {
//编辑
dto.setSingleEffectConfigId(record.getSingleEffectConfigId());
dataSingleEffectConfigService.editSingleEffectConfig(dto);
return ServiceResponse.success();
public ServiceResponse<Void> configSingleEffect(List<DataSingleEffectConfigDTO> dtoList) {
if (CollectionUtils.isEmpty(dtoList)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "单效配置内容为空");
}
for (DataSingleEffectConfigDTO dto : dtoList) {
dataSingleEffectConfigService.deleteSingleEffectConfig(dto.getEnterpriseId(), dto.getOrderGrain());
dataSingleEffectConfigService.saveSingleEffectConfig(dto);
}
dataSingleEffectConfigService.saveSingleEffectConfig(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<DataSingleEffectConfigDTO> getSingleEffectConfig(Integer enterpriseId) {
TabDataSingleEffectConfig record = dataSingleEffectConfigService.getByEnterpriseId(enterpriseId);
if (record == null) {
return ServiceResponse.success(EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class,
public ServiceResponse<List<DataSingleEffectConfigDTO>> getSingleEffectConfig(Integer enterpriseId) {
List<TabDataSingleEffectConfig> record = dataSingleEffectConfigService.getByEnterpriseId(enterpriseId);
if (CollectionUtils.isEmpty(record)) {
return ServiceResponse.success(EntityUtil.changeEntityListNew(DataSingleEffectConfigDTO.class,
dataSingleEffectConfigService.getByEnterpriseId(-1)));
}
return ServiceResponse.success(EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class, record));
return ServiceResponse.success(EntityUtil.changeEntityListNew(DataSingleEffectConfigDTO.class, record));
}
@Override
public ServiceResponse<Void> initSingleEffectConfig(Integer enterpriseId) {
DataSingleEffectConfigDTO dto = EntityUtil.changeEntityNew(DataSingleEffectConfigDTO.class,
List<DataSingleEffectConfigDTO> dtoList = EntityUtil.changeEntityListNew(DataSingleEffectConfigDTO.class,
dataSingleEffectConfigService.getByEnterpriseId(-1));
dto.setSingleEffectConfigId(null);
dto.setEnterpriseId(enterpriseId);
configSingleEffect(dto);
dtoList = dtoList.stream().map(e -> e.setEnterpriseId(enterpriseId))
.map(e -> e.setSingleEffectConfigId(null)).collect(Collectors.toList());
configSingleEffect(dtoList);
return ServiceResponse.success();
}
......@@ -159,4 +164,32 @@ public class DataConfigApiServiceImpl implements DataConfigApiService {
configPerformance(dto);
return ServiceResponse.success();
}
@Override
public ServiceResponse<Void> saveGenerationConfig(List<DataGenerationConfigDTO> dtoList) {
if (CollectionUtils.isEmpty(dtoList)) {
return ServiceResponse.failure(ErrorCode.PARAMETER_ERROR.getCode(), "年龄段配置内容为空");
}
dataGenerationConfigService.deleteGenerationConfig(dtoList.get(0).getEnterpriseId());
dtoList.stream()
.forEach(e -> dataGenerationConfigService.saveGenerationConfig(e));
return ServiceResponse.success();
}
@Override
public ServiceResponse<List<DataGenerationConfigDTO>> listGenerationConfig(Integer enterpriseId) {
List<TabDataGenerationConfig> list = dataGenerationConfigService.listGenerationByEnterpriseId(enterpriseId);
return ServiceResponse.success(CollectionUtils.isEmpty(list) ?
EntityUtil.changeEntityListNew(DataGenerationConfigDTO.class, dataGenerationConfigService.listGenerationByEnterpriseId(-1)) :
EntityUtil.changeEntityListNew(DataGenerationConfigDTO.class, list));
}
@Override
public ServiceResponse<Void> initGenerationConfig(Integer enterpriseId) {
List<DataGenerationConfigDTO> dtoList = EntityUtil.changeEntityListNew(DataGenerationConfigDTO.class,
dataGenerationConfigService.listGenerationByEnterpriseId(-1));
saveGenerationConfig(dtoList.stream().map(e -> e.setEnterpriseId(enterpriseId))
.map(e -> e.setGenerationConfigId(null)).collect(Collectors.toList()));
return ServiceResponse.success();
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/DownloadReportApiServiceImpl.java
......@@ -114,6 +114,7 @@ public class DownloadReportApiServiceImpl implements DownloadReportApiService {
// 判断是否超时
if (DataSecurityAuditEnum.WAIT.getCode().equals(downloadReportDTO.getAuditResult()) && DateUtil.compareDate(currDate, downloadReportDTO.getAuditExpireTime())) {
downloadReportDTO.setDownloadReportStatus(DownloadReportStatusEnum.OVER_TIME.getCode());
downloadReportDTO.setAuditReason("审核超时");
} else if (DataSecurityAuditEnum.PASS.getCode().equals(downloadReportDTO.getAuditResult())) {
// 判断生成状态
downloadReportDTO.setDownloadReportStatus(StringUtils.isNotBlank(downloadReportDTO.getDownloadUrl()) ? DownloadReportStatusEnum.GENERATED.getCode() : DownloadReportStatusEnum.BUILD.getCode());
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java
......@@ -144,12 +144,16 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
//初始化计费中心账户
billingAccountService.createBillingAccount(enterpriseId);
//数据配置：会员消费配置
dataConfigApiService.initMemberConsumeConfig(enterpriseId);
//数据配置：实付配置默认数据
dataConfigApiService.initActuallyPaidData(enterpriseId);
//数据配置：单效取值配置默认数据
dataConfigApiService.initSingleEffectConfig(enterpriseId);
//业绩指标配置默认数据
dataConfigApiService.initPerformanceConfig(enterpriseId);
//年龄段配置
dataConfigApiService.initGenerationConfig(enterpriseId);
UserDTO userDTO = EntityUtil.changeEntityNew(UserDTO.class, enterpriseDTO);
//新增超级管理员
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/SmsRecordApiServiceImpl.java
......@@ -90,7 +90,7 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
Integer unitFee = accountStandardService.queryUnitFee(enterpriseId, AccountStandardEnum.SMS.getCode());
double needFee = (double) (missCount * unitFee) / 1000;
if (needFee - accountBalance > 5000d) {
if (needFee - accountBalance > billingAccount.getCreditLine()) {
logger.info("enterpriseId:{}, 余额：{}, 发送条数：{}, 不能发送", enterpriseId, accountBalance, sendCount);
return EnterpriseServiceResponse.failure(ErrorCode.OPERATION_FAILED.getCode(), "余额不足， 不能发送");
} else {
......@@ -101,6 +101,7 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
@Override
public ServiceResponse<Void> saveSmsRecord(SmsRecordDTO smsRecordDTO) {
logger.info("收到国内短信计费信息：{}", JSON.toJSONString(smsRecordDTO));
if (StringUtils.isBlank(smsRecordDTO.getNationCode())) {
smsRecordDTO.setNationCode("+86");
}
......@@ -115,12 +116,13 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
if (StringUtils.equals("86", smsRecordDTO.getNationCode()) || StringUtils.equals("+86", smsRecordDTO.getNationCode())) {
ServiceResponse paramResult = ValidUtil.allCheckValidate(smsRecordDTO, SmsRecordDTO.SmsRecordValid.class);
if (!paramResult.isSuccess()) {
logger.info("短信验证不通过:{}", paramResult.getMessage());
return paramResult;
}
GicMQClient client = GICMQClientUtil.getClientInstance();
try {
String json = JSON.toJSONString(smsRecordDTO);
logger.info("收到国内短信计费信息：{}", json);
// logger.info("收到国内短信计费信息：{}", json);
client.sendMessage("smsMq", json);
// this.run(json);
} catch (Exception e) {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/TodoItemApiServiceImpl.java
......@@ -4,17 +4,24 @@ import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.enterprise.dto.DictDTO;
import com.gic.enterprise.dto.TodoItemDTO;
import com.gic.enterprise.entity.TabTodoItem;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.qo.TodoItemQO;
import com.gic.enterprise.response.EnterpriseServiceResponse;
import com.gic.enterprise.service.DictApiService;
import com.gic.enterprise.service.TodoItemApiService;
import com.gic.enterprise.service.TodoItemService;
import com.gic.enterprise.utils.valid.ValidParamsUtils;
import org.apache.commons.collections.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
*
* @Description:
......@@ -26,6 +33,8 @@ public class TodoItemApiServiceImpl implements TodoItemApiService {
@Autowired
private TodoItemService todoItemService;
@Autowired
private DictApiService dictApiService;
@Override
public ServiceResponse<Void> saveTodoItem(TodoItemDTO todoItemDTO) {
......@@ -55,6 +64,13 @@ public class TodoItemApiServiceImpl implements TodoItemApiService {
public ServiceResponse<Page<TodoItemDTO>> listTodoItem(TodoItemQO todoItemQO) {
com.github.pagehelper.Page<TabTodoItem> page = this.todoItemService.listTodoItem(todoItemQO);
Page<TodoItemDTO> result = PageHelperUtils.changePageHelperToCurrentPage(page, TodoItemDTO.class);
if (CollectionUtils.isNotEmpty(page)) {
List<DictDTO> list = dictApiService.listTodoItemType().getResult();
Map<String, String> map = list.stream().collect(Collectors.toMap(DictDTO::getValue, DictDTO::getKey));
for (TodoItemDTO e : result.getResult()) {
e.setItemTypeName(map.get(e.getItemType()));
}
}
return EnterpriseServiceResponse.success(result);
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/OfflineStrategy.java
package com.gic.enterprise.service.outer.impl.pay;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.service.UserApiService;
import com.gic.commons.util.DateUtil;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.enterprise.constant.BillingPayResultEnum;
import com.gic.enterprise.constant.BuyTypeEnum;
import com.gic.enterprise.constant.PayTypeEnum;
import com.gic.enterprise.constant.*;
import com.gic.enterprise.dto.ApprovalCallBackDTO;
import com.gic.enterprise.dto.BillingPayInfoDTO;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.dto.OutPayDTO;
import com.gic.enterprise.entity.TabBillingPayInfo;
import com.gic.enterprise.entity.TabBillingRechargeRecord;
import com.gic.enterprise.entity.TabEnterprise;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.BillingOrderService;
import com.gic.enterprise.service.BillingPayInfoService;
import com.gic.enterprise.service.BillingRechargeRecordService;
import com.gic.enterprise.service.EnterpriseService;
import com.gic.enterprise.service.*;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.finance.constant.InitiatorTypeEnum;
import com.gic.finance.dto.TransferAccountsApprovalDTO;
import com.gic.finance.service.TransferAccountsApprovalApiService;
import com.gic.marketing.process.api.service.sms.SmsSendApiService;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import java.util.Date;
/**
*
......@@ -52,6 +51,12 @@ public class OfflineStrategy implements PayStrategy {
private EnterpriseService enterpriseService;
@Autowired
private TransferAccountsApprovalApiService transferAccountsApprovalApiService;
@Autowired
private SmsSendApiService smsSendApiService;
@Autowired
private UserApiService userApiService;
@Autowired
private EnterpriseApiService enterpriseApiService;
@Override
public ServiceResponse<BillingPayInfoDTO> savePrePayInfo(OutPayDTO outPayDTO) {
......@@ -139,6 +144,8 @@ public class OfflineStrategy implements PayStrategy {
public ServiceResponse<Void> callBack(ApprovalCallBackDTO resData) {
logger.info("银行线下支付回调结果:{}", JSON.toJSONString(resData));
sendApprovalSms(resData);
String orderSerialNumber = resData.getOrderSerialNumber();
TabBillingPayInfo billingPayInfo = billingPayInfoService.getByOrderSerialNumber(orderSerialNumber, PayTypeEnum.OFFLINE_PAY.getCode());
resData.setPaySerialNumber(billingPayInfo.getSerialNumber());
......@@ -147,8 +154,10 @@ public class OfflineStrategy implements PayStrategy {
Integer i = billingPayInfoService.updatePayInfoBySerialNumber(resData);
switch (resData.getBuyType()) {
case 1:
billingRechargeRecordService.updateBySerialNumber(billingPayInfo.getEnterpriseId(), resData.getOrderSerialNumber(), resData.getTotalFee(), resData.getTotalFeePaid(), resData.getAuditStatus(), resData.getTimeEnd());
// 商户余额充值
billingRechargeRecordService.updateBySerialNumber(billingPayInfo.getEnterpriseId(), resData.getOrderSerialNumber(), resData.getTotalFee(), resData.getTotalFeePaid(), resData.getAuditStatus(), resData.getTimeEnd());
sendRechargeSuccessSms(resData, billingPayInfo.getEnterpriseId());
break;
case 2:
// 短信套餐包购买
......@@ -163,6 +172,35 @@ public class OfflineStrategy implements PayStrategy {
return ServiceResponse.success();
}
private void sendRechargeSuccessSms(ApprovalCallBackDTO resData, Integer enterpriseId) {
UserDTO userDTO = userApiService.getUserByEnterpriseId(enterpriseId).getResult();
sendSms(resData, userDTO, "GICJFZX005");
}
private void sendApprovalSms(ApprovalCallBackDTO resData) {
TabBillingRechargeRecord rechargeRecord = billingRechargeRecordService.getRechargeRecordBySerialNumber(resData.getOrderSerialNumber());
Integer initiator = rechargeRecord.getInitiator();
UserDTO userDTO = userApiService.getUserById(initiator).getResult();
sendSms(resData, userDTO, "GICJFZX008");
}
private void sendSms(ApprovalCallBackDTO resData, UserDTO userDTO, String code) {
try {
if (StringUtils.isBlank(userDTO.getPhoneAreaCode())) {
userDTO.setPhoneAreaCode("+86");
}
EnterpriseDTO enterpriseDTO = enterpriseApiService.getEnterpriseById(userDTO.getEnterpriseId()).getResult();
String[] smsArr = new String[]{enterpriseDTO.getEnterpriseName(), resData.getOrderSerialNumber(), BillingAuditStatusEnum.PASS.getCode().equals(resData.getAuditStatus()) ? "成功" : "失败"};
ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(code,
userDTO.getEnterpriseId(), userDTO.getPhoneAreaCode(), userDTO.getPhoneNumber(), smsArr);
if (!smsSendResult.isSuccess()) {
logger.warn(smsSendResult.getMessage());
}
} catch (Exception e) {
logger.info("发送短信失败", e);
}
}
private void initiateApproval(OutPayDTO outPayDTO) {
TransferAccountsApprovalDTO approvalDTO = new TransferAccountsApprovalDTO();
......@@ -183,7 +221,7 @@ public class OfflineStrategy implements PayStrategy {
//com.gic.enterprise.service.BillingPayInfoApiService.offlineCallBack()
logger.info("调用财务模块接口:{}", JSON.toJSONString(approvalDTO));
ServiceResponse<Void> serviceResponse = null;
ServiceResponse<Void> serviceResponse = new ServiceResponse<>();
if (approvalDTO.getOrderType() == BuyTypeEnum.BALANCE_RECHARGE.getCode()) {
serviceResponse = transferAccountsApprovalApiService.rechargeInitiateApproval(approvalDTO);
} else if (approvalDTO.getOrderType() == BuyTypeEnum.BUY_SHORT_MESSAGE_PACKAGE.getCode()) {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/WxPayStrategy.java
package com.gic.enterprise.service.outer.impl.pay;
import java.math.BigDecimal;
import java.util.Date;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
import com.gic.auth.service.UserApiService;
import com.gic.commons.util.DateUtil;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
......@@ -18,16 +11,23 @@ import com.gic.enterprise.constant.BillingAuditStatusEnum;
import com.gic.enterprise.constant.PayTypeEnum;
import com.gic.enterprise.dto.ApprovalCallBackDTO;
import com.gic.enterprise.dto.BillingPayInfoDTO;
import com.gic.enterprise.dto.EnterpriseDTO;
import com.gic.enterprise.dto.OutPayDTO;
import com.gic.enterprise.entity.TabBillingPayInfo;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.BillingOrderService;
import com.gic.enterprise.service.BillingPayInfoService;
import com.gic.enterprise.service.BillingRechargeRecordService;
import com.gic.enterprise.service.PushMessageApiService;
import com.gic.enterprise.service.*;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.marketing.process.api.service.sms.SmsSendApiService;
import com.gic.thirdparty.api.dto.ScanPayReqDataDTO;
import com.gic.thirdparty.api.service.Pay4WXService;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.math.BigDecimal;
import java.util.Date;
/**
*
......@@ -49,6 +49,12 @@ public class WxPayStrategy implements PayStrategy {
private BillingOrderService billingOrderService;
@Autowired
private PushMessageApiService pushMessageApiService;
@Autowired
private UserApiService userApiService;
@Autowired
private EnterpriseApiService enterpriseApiService;
@Autowired
SmsSendApiService smsSendApiService;
@Override
public ServiceResponse<BillingPayInfoDTO> savePrePayInfo(OutPayDTO outPayDTO) {
......@@ -114,6 +120,7 @@ public class WxPayStrategy implements PayStrategy {
// 商户余额充值
billingRechargeRecordService.updateBySerialNumber(resData.getEnterpriseId(), billingPayInfo.getOrderSerialNumber(), resData.getTotalFeePaid(), resData.getTotalFeePaid(), BillingAuditStatusEnum.PASS.getCode(), resData.getTimeEnd());
this.pushMessageApiService.pushMessage(resData.getEnterpriseId(), "系统通知", "余额充值", "您的商户成功充值"+resData.getTotalFeePaid()+"元！感谢您的支持和使用！");
sendRechargeSuccessSms(resData, billingPayInfo.getEnterpriseId());
break;
case 2:
// 短信套餐包购买
......@@ -168,4 +175,27 @@ public class WxPayStrategy implements PayStrategy {
}
}
private void sendRechargeSuccessSms(ApprovalCallBackDTO resData, Integer enterpriseId) {
UserDTO userDTO = userApiService.getUserByEnterpriseId(enterpriseId).getResult();
sendSms(resData, userDTO, "GICJFZX005");
}
private void sendSms(ApprovalCallBackDTO resData, UserDTO userDTO, String code) {
try {
if (StringUtils.isBlank(userDTO.getPhoneAreaCode())) {
userDTO.setPhoneAreaCode("+86");
}
EnterpriseDTO enterpriseDTO = enterpriseApiService.getEnterpriseById(userDTO.getEnterpriseId()).getResult();
String[] smsArr = new String[]{enterpriseDTO.getEnterpriseName(), resData.getOrderSerialNumber(), BillingAuditStatusEnum.PASS.getCode().equals(resData.getAuditStatus()) ? "成功" : "失败"};
ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(code,
userDTO.getEnterpriseId(), userDTO.getPhoneAreaCode(), userDTO.getPhoneNumber(), smsArr);
if (!smsSendResult.isSuccess()) {
logger.warn(smsSendResult.getMessage());
}
} catch (Exception e) {
logger.info("发送短信失败", e);
}
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/BillingInternationSmsRecord.java 0 → 100644
package com.gic.enterprise.utils.chart;
import java.util.List;
import javax.annotation.PostConstruct;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import com.gic.enterprise.dto.HomeStatisticsDTO;
import com.gic.enterprise.qo.HomeStatisticsQO;
import com.gic.enterprise.service.BillingInternationalSmsRecordService;
/**
* 海外短信消费明细
* @ClassName: BillingAccountBalanceRecord

* @Description: 

* @author guojuxing

* @date 2019/8/23 2:19 PM

*/
@Component
public class BillingInternationSmsRecord implements IFeeChart{
@Autowired
private BillingInternationalSmsRecordService billingInternationalSmsRecordService;
private static BillingInternationSmsRecord billingInternationSmsRecord;
@PostConstruct
public void init() {
billingInternationSmsRecord = this;
}
@Override
public List<HomeStatisticsDTO> listHomeStatistics(HomeStatisticsQO params) {
return billingInternationSmsRecord.billingInternationalSmsRecordService.listHomeStatistics(params);
}
@Override
public double getFee(Integer enterpriseId, Integer dateType) {
return billingInternationSmsRecord.billingInternationalSmsRecordService.getFee(enterpriseId, dateType);
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/utils/chart/FeeChartUtils.java
......@@ -24,6 +24,7 @@ public class FeeChartUtils {
// getPageMap.put(FeeTypeEnum.RECORDING_STORAGE.getCode(), new BillingRecordingStorageRecord());
getPageMap.put(FeeTypeEnum.SMS.getCode(), new BillingSmsRecord());
getPageMap.put(FeeTypeEnum.SMS_PACKAGE.getCode(), new BillingSmsPackageRecord());
getPageMap.put(FeeTypeEnum.INTERNATIONAL_SMS.getCode(), new BillingInternationSmsRecord());
// getPageMap.put(FeeTypeEnum.VOICE_CODE.getCode(), new BillingVoiceCodeRecord());
}
......
gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml
......@@ -127,6 +127,7 @@
<dubbo:service interface="com.gic.enterprise.service.WmStoreApiService" ref="wmStoreApiService" timeout="6000" />
<dubbo:service interface="com.gic.enterprise.service.DataConfigApiService" ref="dataConfigApiService" timeout="6000" />
<dubbo:service interface="com.gic.enterprise.service.AppletQrcodeApiService" ref="appletQrcodeApiService" timeout="6000" />
<dubbo:reference interface="com.gic.mall.share.api.service.ShopApiService" id="shopApiService" timeout="6000" />
......@@ -136,4 +137,6 @@
<dubbo:reference interface="com.gic.member.api.service.MemberUserApiService" id="memberUserApiService" timeout="60000" />
<dubbo:reference interface="com.gic.store.service.StoreApiService" id="storeApiService" timeout="60000" />
<dubbo:reference interface="com.gic.member.api.service.UserOwnerApiService" id="userOwnerApiService" timeout="60000" />
<dubbo:reference interface="com.gic.marketing.process.api.service.sms.SmsSendApiService" id="smsSendApiService" timeout="60000" />
<dubbo:reference interface="com.gic.wechat.business.api.service.wxa.WeixinWxaFunService" id="weixinWxaFunService" timeout="60000" />
</beans>
gic-platform-enterprise-service/src/main/resources/mapper/TabAppletQrcodeMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabAppletQrcodeMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabAppletQrcode">
<id column="id" jdbcType="INTEGER" property="id" />
<result column="path" jdbcType="VARCHAR" property="path" />
<result column="params" jdbcType="VARCHAR" property="params" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="appid" jdbcType="VARCHAR" property="appid" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
</resultMap>
<sql id="Base_Column_List">
id, path, params, enterprise_id, appid, create_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_applet_qrcode
where id = #{id,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_applet_qrcode
where id = #{id,jdbcType=INTEGER}
</delete>
<insert id="insert" useGeneratedKeys="true" keyProperty="id" parameterType="com.gic.enterprise.entity.TabAppletQrcode">
insert into tab_applet_qrcode (id, path, params,
enterprise_id, appid, create_time
)
values (#{id,jdbcType=INTEGER}, #{path,jdbcType=VARCHAR}, #{params,jdbcType=VARCHAR},
#{enterpriseId,jdbcType=INTEGER}, #{appid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" useGeneratedKeys="true" keyProperty="id" parameterType="com.gic.enterprise.entity.TabAppletQrcode">
insert into tab_applet_qrcode
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="path != null">
path,
</if>
<if test="params != null">
params,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="appid != null">
appid,
</if>
<if test="createTime != null">
create_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=INTEGER},
</if>
<if test="path != null">
#{path,jdbcType=VARCHAR},
</if>
<if test="params != null">
#{params,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="appid != null">
#{appid,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabAppletQrcode">
update tab_applet_qrcode
<set>
<if test="path != null">
path = #{path,jdbcType=VARCHAR},
</if>
<if test="params != null">
params = #{params,jdbcType=VARCHAR},
</if>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="appid != null">
appid = #{appid,jdbcType=VARCHAR},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
</set>
where id = #{id,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabAppletQrcode">
update tab_applet_qrcode
set path = #{path,jdbcType=VARCHAR},
params = #{params,jdbcType=VARCHAR},
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
appid = #{appid,jdbcType=VARCHAR},
create_time = #{createTime,jdbcType=TIMESTAMP}
where id = #{id,jdbcType=INTEGER}
</update>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabAppletServiceConfigMapper.xml
......@@ -7,12 +7,14 @@
<result column="app_id" jdbcType="VARCHAR" property="appId" />
<result column="name" jdbcType="VARCHAR" property="name" />
<result column="type" jdbcType="INTEGER" property="type" />
<result column="config_id" jdbcType="BIGINT" property="configId" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
<result column="status" jdbcType="INTEGER" property="status" />
</resultMap>
<sql id="Base_Column_List">
applet_service_id, enterprise_id, app_id, name, type, create_time, update_time, status
applet_service_id, enterprise_id, app_id, name, type, config_id, create_time, update_time,
status
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -26,11 +28,13 @@
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabAppletServiceConfig">
insert into tab_applet_service_config (applet_service_id, enterprise_id, app_id,
name, type, create_time,
update_time, status)
name, type, config_id,
create_time, update_time, status
)
values (#{appletServiceId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{appId,jdbcType=VARCHAR},
#{name,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
#{name,jdbcType=VARCHAR}, #{type,jdbcType=INTEGER}, #{configId,jdbcType=BIGINT},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabAppletServiceConfig">
insert into tab_applet_service_config
......@@ -50,6 +54,9 @@
<if test="type != null">
type,
</if>
<if test="configId != null">
config_id,
</if>
<if test="createTime != null">
create_time,
</if>
......@@ -76,6 +83,9 @@
<if test="type != null">
#{type,jdbcType=INTEGER},
</if>
<if test="configId != null">
#{configId,jdbcType=BIGINT},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -102,6 +112,9 @@
<if test="type != null">
type = #{type,jdbcType=INTEGER},
</if>
<if test="configId != null">
config_id = #{configId,jdbcType=BIGINT},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
......@@ -120,6 +133,7 @@
app_id = #{appId,jdbcType=VARCHAR},
name = #{name,jdbcType=VARCHAR},
type = #{type,jdbcType=INTEGER},
config_id = #{configId,jdbcType=BIGINT},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER}
......@@ -128,7 +142,7 @@
<insert id="insertList">
insert into tab_applet_service_config (applet_service_id, enterprise_id, app_id,
name, type, create_time,
update_time, status)
update_time, status, config_id)
values
<foreach collection="list" index="index" item="item" separator=",">
(
......@@ -139,7 +153,8 @@
#{item.type,jdbcType=INTEGER},
#{item.createTime,jdbcType=TIMESTAMP},
#{item.updateTime,jdbcType=TIMESTAMP},
1
1,
#{item.configId,jdbcType=BIGINT}
)
</foreach>
-- ON DUPLICATE KEY UPDATE name = VALUES(name)
......@@ -156,6 +171,12 @@
<if test="search != null and search != '' ">
and name like concat('%', #{search}, '%')
</if>
<if test="null != appIdList and appIdList.size &gt; 0">
and config_id in
<foreach close=")" collection="appIdList" index="index" item="item" open="(" separator=",">
#{item}
</foreach>
</if>
</select>
<select id="getAppByAppId" resultMap="BaseResultMap">
select
......
gic-platform-enterprise-service/src/main/resources/mapper/TabAuditLogMapper.xml
......@@ -298,6 +298,7 @@
or auditor_phone like concat('%', #{search},'%')
)
</if>
order by create_time desc
</select>
<select id="getWaitAuditByProjectItem" resultMap="BaseResultMap">
select
......
gic-platform-enterprise-service/src/main/resources/mapper/TabBillingAccountBalanceRecordMapper.xml
......@@ -296,7 +296,7 @@
and product_name like concat('%', #{productName}, '%')
</if>
</where>
order by create_time desc
order by deduction_time desc
</select>
<select id="countAccountBalanceRecord" resultType="int">
select
......
gic-platform-enterprise-service/src/main/resources/mapper/TabBillingInternationalSmsRecordMapper.xml
......@@ -416,6 +416,7 @@
from tab_billing_international_sms_record
where status = 1
and enterprise_id = #{enterpriseId}
and pay_type = 4
<if test="startTime != null">
and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
</if>
......@@ -430,6 +431,7 @@
from tab_billing_international_sms_record
where status = 1
and enterprise_id = #{enterpriseId}
and pay_type = 4
<if test="dateType == 1 ">
and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
</if>
......@@ -480,7 +482,7 @@
and sms_type = #{smsType}
</if>
</where>
order by create_time desc
order by deduction_time desc
</select>
<select id="countInternationalSmsRecord" resultType="int">
select
......
gic-platform-enterprise-service/src/main/resources/mapper/TabBillingPayInfoMapper.xml
......@@ -295,6 +295,9 @@
and time_end is not null
and invoice_status = 0
and status = 1
<if test="serialNumber != null and serialNumber != '' ">
and (serial_number like concat('%', #{serialNumber}, '%') or order_serial_number like concat('%', #{serialNumber}, '%'))
</if>
<if test="buyType != null">
and buy_type = #{buyType}
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabBillingRechargeRecordMapper.xml
......@@ -244,6 +244,9 @@
<if test="auditStatus == null">
and audit_status &lt;&gt; 0
</if>
<if test="serialNumber != null and serialNumber != '' ">
and serial_number like concat('%', #{serialNumber}, '%')
</if>
order by create_time desc
</select>
<update id="updateBySerialNumber">
......
gic-platform-enterprise-service/src/main/resources/mapper/TabBillingSmsPackageRecordMapper.xml
......@@ -242,6 +242,7 @@
from tab_billing_sms_package_record
where status = 1
and enterprise_id = #{enterpriseId}
and pay_type = 4
<if test="startTime != null">
and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
</if>
......@@ -258,6 +259,7 @@
from tab_billing_sms_package_record
where status = 1
and enterprise_id = #{enterpriseId}
and pay_type = 4
<if test="dateType == 1 ">
and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
</if>
......@@ -299,7 +301,7 @@
and product_name like concat('%', #{productName}, '%' )
</if>
</where>
order by create_time desc
order by deduction_time desc
</select>
<select id="countSmsPackageRecord" resultType="int">
select
......
gic-platform-enterprise-service/src/main/resources/mapper/TabBillingSmsRecordMapper.xml
......@@ -399,6 +399,7 @@
and cache_status = 1
and database_status = 1
and enterprise_id = #{enterpriseId}
and pay_type = 4
<if test="startTime != null">
and DATE_FORMAT(deduction_time,'%Y-%m-%d') &gt;= #{startTime}
</if>
......@@ -416,6 +417,7 @@
and cache_status = 1
and database_status = 1
and enterprise_id = #{enterpriseId}
and pay_type = 4
<if test="dateType == 1 ">
and date_format(deduction_time,'%Y-%m') = date_format(now(),'%Y-%m')
</if>
......@@ -490,7 +492,7 @@
and sms_type = #{smsType}
</if>
</where>
order by create_time desc
order by deduction_time desc
</select>
<select id="countSmsRecord" resultType="int">
select
......
gic-platform-enterprise-service/src/main/resources/mapper/TabConfigRuleEnterpriseMapper.xml
......@@ -118,7 +118,9 @@
from tab_config_rule_enterprise t1
left join tab_config_rule_enterprise_rel t2 on t1.enterprise_rule_id = t2.enterprise_rule_id
and t2.status = 1
and t2.enterprise_id != -1
<if test="search == null or search == '' ">
and t2.enterprise_id != -1
</if>
<if test="search != null and search != '' ">
left join tab_enterprise t3 on t2.enterprise_id = t3.enterprise_id
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabCustomGuideMapper.xml
......@@ -225,14 +225,21 @@
select
version
from tab_custom_guide
where enterprise_id = #{enterpriseId,jdbcType=INTEGER} and appid=#{appid}
where 1=1
<if test="enterpriseId != null">
and enterprise_id = #{enterpriseId,jdbcType=INTEGER}
</if>
and appid=#{appid}
order by version desc
</select>
<select id="listGuide" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_custom_guide
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
where 1=1
<if test="enterpriseId != null">
and enterprise_id = #{enterpriseId,jdbcType=INTEGER}
</if>
<if test="version != null">
and version = #{version}
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabCustomThemeMapper.xml
......@@ -118,7 +118,10 @@
select
<include refid="Base_Column_List" />
from tab_custom_theme
where enterprise_id = #{enterpriseId,jdbcType=INTEGER}
where 1=1
<if test="enterpriseId != null">
and enterprise_id = #{enterpriseId,jdbcType=INTEGER}
</if>
and appid= #{appid}
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabDataGenerationConfigMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabDataGenerationConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataGenerationConfig">
<id column="generation_config_id" jdbcType="INTEGER" property="generationConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="age_level" jdbcType="INTEGER" property="ageLevel" />
<result column="first_sign" jdbcType="INTEGER" property="firstSign" />
<result column="age_first_value" jdbcType="INTEGER" property="ageFirstValue" />
<result column="second_sign" jdbcType="INTEGER" property="secondSign" />
<result column="age_second_value" jdbcType="INTEGER" property="ageSecondValue" />
<result column="description" jdbcType="VARCHAR" property="description" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
generation_config_id, enterprise_id, age_level, first_sign, age_first_value, second_sign,
age_second_value, description, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_data_generation_config
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_data_generation_config
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
insert into tab_data_generation_config (generation_config_id, enterprise_id,
age_level, first_sign, age_first_value,
second_sign, age_second_value, description,
status, create_time, update_time
)
values (#{generationConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{ageLevel,jdbcType=INTEGER}, #{firstSign,jdbcType=INTEGER}, #{ageFirstValue,jdbcType=INTEGER},
#{secondSign,jdbcType=INTEGER}, #{ageSecondValue,jdbcType=INTEGER}, #{description,jdbcType=VARCHAR},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
insert into tab_data_generation_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="generationConfigId != null">
generation_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="ageLevel != null">
age_level,
</if>
<if test="firstSign != null">
first_sign,
</if>
<if test="ageFirstValue != null">
age_first_value,
</if>
<if test="secondSign != null">
second_sign,
</if>
<if test="ageSecondValue != null">
age_second_value,
</if>
<if test="description != null">
description,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="generationConfigId != null">
#{generationConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="ageLevel != null">
#{ageLevel,jdbcType=INTEGER},
</if>
<if test="firstSign != null">
#{firstSign,jdbcType=INTEGER},
</if>
<if test="ageFirstValue != null">
#{ageFirstValue,jdbcType=INTEGER},
</if>
<if test="secondSign != null">
#{secondSign,jdbcType=INTEGER},
</if>
<if test="ageSecondValue != null">
#{ageSecondValue,jdbcType=INTEGER},
</if>
<if test="description != null">
#{description,jdbcType=VARCHAR},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
update tab_data_generation_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="ageLevel != null">
age_level = #{ageLevel,jdbcType=INTEGER},
</if>
<if test="firstSign != null">
first_sign = #{firstSign,jdbcType=INTEGER},
</if>
<if test="ageFirstValue != null">
age_first_value = #{ageFirstValue,jdbcType=INTEGER},
</if>
<if test="secondSign != null">
second_sign = #{secondSign,jdbcType=INTEGER},
</if>
<if test="ageSecondValue != null">
age_second_value = #{ageSecondValue,jdbcType=INTEGER},
</if>
<if test="description != null">
description = #{description,jdbcType=VARCHAR},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataGenerationConfig">
update tab_data_generation_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
age_level = #{ageLevel,jdbcType=INTEGER},
first_sign = #{firstSign,jdbcType=INTEGER},
age_first_value = #{ageFirstValue,jdbcType=INTEGER},
second_sign = #{secondSign,jdbcType=INTEGER},
age_second_value = #{ageSecondValue,jdbcType=INTEGER},
description = #{description,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where generation_config_id = #{generationConfigId,jdbcType=INTEGER}
</update>
<update id="deleteGenerationConfig">
update tab_data_generation_config set status = 0
where enterprise_id = #{enterpriseId}
and status = 1
</update>
<select id="listGenerationByEnterpriseId" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_data_generation_config
where enterprise_id = #{enterpriseId}
and status = 1
order by age_level
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabDataMemberConsumeConfigMapper.xml
......@@ -5,15 +5,17 @@
<id column="member_consume_config_id" jdbcType="INTEGER" property="memberConsumeConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="member_consume_count" jdbcType="INTEGER" property="memberConsumeCount" />
<result column="member_consume_max" jdbcType="INTEGER" property="memberConsumeMax" />
<result column="member_consume_times" jdbcType="INTEGER" property="memberConsumeTimes" />
<result column="member_consume_max_default" jdbcType="INTEGER" property="memberConsumeMaxDefault" />
<result column="member_consume_times_default" jdbcType="INTEGER" property="memberConsumeTimesDefault" />
<result column="member_consume_max_goods" jdbcType="INTEGER" property="memberConsumeMaxGoods" />
<result column="member_consume_times_goods" jdbcType="INTEGER" property="memberConsumeTimesGoods" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
member_consume_config_id, enterprise_id, member_consume_count, member_consume_max,
member_consume_times, status, create_time, update_time
member_consume_config_id, enterprise_id, member_consume_count, member_consume_max_default, member_consume_times_default,
member_consume_max_goods, member_consume_times_goods, status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
......@@ -27,11 +29,13 @@
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataMemberConsumeConfig">
insert into tab_data_member_consume_config (member_consume_config_id, enterprise_id,
member_consume_count, member_consume_max, member_consume_times,
member_consume_count, member_consume_max_default, member_consume_times_default,
member_consume_max_goods, member_consume_times_goods,
status, create_time, update_time
)
values (#{memberConsumeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
#{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMax,jdbcType=INTEGER}, #{memberConsumeTimes,jdbcType=INTEGER},
#{memberConsumeCount,jdbcType=INTEGER}, #{memberConsumeMaxDefault,jdbcType=INTEGER}, #{memberConsumeTimesDefault,jdbcType=INTEGER},
#{memberConsumeMaxGoods,jdbcType=INTEGER}, #{memberConsumeTimesGoods,jdbcType=INTEGER},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
......@@ -47,11 +51,17 @@
<if test="memberConsumeCount != null">
member_consume_count,
</if>
<if test="memberConsumeMax != null">
member_consume_max,
<if test="memberConsumeMaxDefault != null">
member_consume_max_default,
</if>
<if test="memberConsumeTimes != null">
member_consume_times,
<if test="memberConsumeTimesDefault != null">
member_consume_times_default,
</if>
<if test="memberConsumeMaxGoods != null">
member_consume_max_goods,
</if>
<if test="memberConsumeTimesGoods != null">
member_consume_times_goods,
</if>
<if test="status != null">
status,
......@@ -73,11 +83,17 @@
<if test="memberConsumeCount != null">
#{memberConsumeCount,jdbcType=INTEGER},
</if>
<if test="memberConsumeMax != null">
#{memberConsumeMax,jdbcType=INTEGER},
<if test="memberConsumeMaxDefault != null">
#{memberConsumeMaxDefault,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimesDefault != null">
#{memberConsumeTimesDefault,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimes != null">
#{memberConsumeTimes,jdbcType=INTEGER},
<if test="memberConsumeMaxGoods != null">
#{memberConsumeMaxGoods,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimesGoods != null">
#{memberConsumeTimesGoods,jdbcType=INTEGER},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
......@@ -99,11 +115,17 @@
<if test="memberConsumeCount != null">
member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
</if>
<if test="memberConsumeMax != null">
member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
<if test="memberConsumeMaxDefault != null">
member_consume_max_default = #{memberConsumeMaxDefault,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimesDefault != null">
member_consume_times_default = #{memberConsumeTimesDefault,jdbcType=INTEGER},
</if>
<if test="memberConsumeMaxGoods != null">
member_consume_max_goods = #{memberConsumeMaxGoods,jdbcType=INTEGER},
</if>
<if test="memberConsumeTimes != null">
member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
<if test="memberConsumeTimesGoods != null">
member_consume_times_goods = #{memberConsumeTimesGoods,jdbcType=INTEGER},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
......@@ -121,8 +143,10 @@
update tab_data_member_consume_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
member_consume_count = #{memberConsumeCount,jdbcType=INTEGER},
member_consume_max = #{memberConsumeMax,jdbcType=INTEGER},
member_consume_times = #{memberConsumeTimes,jdbcType=INTEGER},
member_consume_max_default = #{memberConsumeMaxDefault,jdbcType=INTEGER},
member_consume_times_default = #{memberConsumeTimesDefault,jdbcType=INTEGER},
member_consume_max_goods = #{memberConsumeMaxGoods,jdbcType=INTEGER},
member_consume_times_goods = #{memberConsumeTimesGoods,jdbcType=INTEGER},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
......
gic-platform-enterprise-service/src/main/resources/mapper/TabDataSingleEffectConfigMapper.xml
......@@ -4,6 +4,7 @@
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabDataSingleEffectConfig">
<id column="single_effect_config_id" jdbcType="INTEGER" property="singleEffectConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="order_grain" jdbcType="INTEGER" property="orderGrain" />
<result column="sale" jdbcType="INTEGER" property="sale" />
<result column="tag" jdbcType="INTEGER" property="tag" />
<result column="order_number" jdbcType="INTEGER" property="orderNumber" />
......@@ -14,7 +15,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
single_effect_config_id, enterprise_id, sale, tag, order_number, sale_number, sale_number_target,
single_effect_config_id, enterprise_id, order_grain, sale, tag, order_number, sale_number, sale_number_target,
status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -28,11 +29,11 @@
where single_effect_config_id = #{singleEffectConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabDataSingleEffectConfig">
insert into tab_data_single_effect_config (single_effect_config_id, enterprise_id,
insert into tab_data_single_effect_config (single_effect_config_id, enterprise_id, order_grain,
sale, tag, order_number, sale_number,
sale_number_target, status, create_time,
update_time)
values (#{singleEffectConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER},
values (#{singleEffectConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{orderGrain,jdbcType=INTEGER},
#{sale,jdbcType=INTEGER}, #{tag,jdbcType=INTEGER}, #{orderNumber,jdbcType=INTEGER}, #{saleNumber,jdbcType=INTEGER},
#{saleNumberTarget,jdbcType=INTEGER}, #{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP},
#{updateTime,jdbcType=TIMESTAMP})
......@@ -46,6 +47,9 @@
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="orderGrain != null">
order_grain,
</if>
<if test="sale != null">
sale,
</if>
......@@ -78,6 +82,9 @@
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="orderGrain != null">
#{orderGrain,jdbcType=INTEGER},
</if>
<if test="sale != null">
#{sale,jdbcType=INTEGER},
</if>
......@@ -110,6 +117,9 @@
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="orderGrain != null">
order_grain = #{orderGrain,jdbcType=INTEGER},
</if>
<if test="sale != null">
sale = #{sale,jdbcType=INTEGER},
</if>
......@@ -140,6 +150,7 @@
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabDataSingleEffectConfig">
update tab_data_single_effect_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
order_grain = #{orderGrain,jdbcType=INTEGER},
sale = #{sale,jdbcType=INTEGER},
tag = #{tag,jdbcType=INTEGER},
order_number = #{orderNumber,jdbcType=INTEGER},
......@@ -156,5 +167,14 @@
from tab_data_single_effect_config
where enterprise_id = #{enterpriseId}
and status = 1
order by order_grain
</select>
<update id="deleteSingleEffectConfig">
update tab_data_single_effect_config set status = 0
where enterprise_id = #{enterpriseId}
and order_grain = #{orderGrain}
and status = 1
</update>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabTodoItemMapper.xml
......@@ -187,9 +187,9 @@
<if test="enterpriseId != null ">
and enterprise_id = #{enterpriseId}
</if>
<if test="userId != null ">
and user_id = #{userId}
</if>
<!-- <if test="userId != null ">
and user_id = #{userId}
</if>-->
<if test="itemType != null ">
and item_type = #{itemType}
</if>
......
gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreConfigMapper.xml
......@@ -4,7 +4,7 @@
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabWmStoreConfig">
<id column="store_config_id" jdbcType="INTEGER" property="storeConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="wm_main_account" jdbcType="VARCHAR" property="wmMainAccount" />
<result column="wm_mall_store_id" jdbcType="INTEGER" property="wmMallStoreId" />
<result column="store_config_type" jdbcType="INTEGER" property="storeConfigType" />
<result column="store_config_json" jdbcType="VARCHAR" property="storeConfigJson" />
<result column="status" jdbcType="INTEGER" property="status" />
......@@ -12,7 +12,7 @@
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
store_config_id, enterprise_id, wm_main_account, store_config_type, store_config_json,
store_config_id, enterprise_id, wm_mall_store_id, store_config_type, store_config_json,
status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
......@@ -26,10 +26,10 @@
where store_config_id = #{storeConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmStoreConfig" useGeneratedKeys="true" keyProperty="storeConfigId">
insert into tab_wm_store_config (store_config_id, enterprise_id, wm_main_account,
insert into tab_wm_store_config (store_config_id, enterprise_id, wm_mall_store_id,
store_config_type, store_config_json, status,
create_time, update_time)
values (#{storeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMainAccount,jdbcType=VARCHAR},
values (#{storeConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMallStoreId,jdbcType=INTEGER},
#{storeConfigType,jdbcType=INTEGER}, #{storeConfigJson,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER},
#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP})
</insert>
......@@ -42,8 +42,8 @@
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="wmMainAccount != null">
wm_main_account,
<if test="wmMallStoreId != null">
wm_mall_store_id,
</if>
<if test="storeConfigType != null">
store_config_type,
......@@ -68,8 +68,8 @@
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
#{wmMainAccount,jdbcType=VARCHAR},
<if test="wmMallStoreId != null">
#{wmMallStoreId,jdbcType=INTEGER},
</if>
<if test="storeConfigType != null">
#{storeConfigType,jdbcType=INTEGER},
......@@ -94,8 +94,8 @@
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMainAccount != null">
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
<if test="wmMallStoreId != null">
wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
</if>
<if test="storeConfigType != null">
store_config_type = #{storeConfigType,jdbcType=INTEGER},
......@@ -118,7 +118,7 @@
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabWmStoreConfig">
update tab_wm_store_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
wm_main_account = #{wmMainAccount,jdbcType=VARCHAR},
wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
store_config_type = #{storeConfigType,jdbcType=INTEGER},
store_config_json = #{storeConfigJson,jdbcType=VARCHAR},
status = #{status,jdbcType=INTEGER},
......@@ -127,11 +127,19 @@
where store_config_id = #{storeConfigId,jdbcType=INTEGER}
</update>
<select id="getByWmMainAccount" resultMap="BaseResultMap">
<select id="getWmStoreConfig" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_store_config
where wm_main_account = #{wmMainAccount}
where wm_mall_store_id = #{wmMallStoreId}
and status = 1
and store_config_type = #{storeConfigType}
</select>
<select id="listWmStoreConfig" resultMap="BaseResultMap">
select <include refid="Base_Column_List"></include>
from tab_wm_store_config
where wm_mall_store_id = #{wmMallStoreId}
and status = 1
order by store_config_type
</select>
</mapper>
\ No newline at end of file
gic-platform-enterprise-service/src/main/resources/mapper/TabWmStoreCouponConfigMapper.xml 0 → 100644
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.gic.enterprise.dao.mapper.TabWmStoreCouponConfigMapper">
<resultMap id="BaseResultMap" type="com.gic.enterprise.entity.TabWmStoreCouponConfig">
<id column="coupon_config_id" jdbcType="INTEGER" property="couponConfigId" />
<result column="enterprise_id" jdbcType="INTEGER" property="enterpriseId" />
<result column="wm_mall_store_id" jdbcType="INTEGER" property="wmMallStoreId" />
<result column="gic_coupon_id" jdbcType="VARCHAR" property="gicCouponId" />
<result column="gic_coupon_name" jdbcType="VARCHAR" property="gicCouponName" />
<result column="wm_coupon_id" jdbcType="VARCHAR" property="wmCouponId" />
<result column="wm_coupon_name" jdbcType="VARCHAR" property="wmCouponName" />
<result column="gic_coupon_expire" jdbcType="TIMESTAMP" property="gicCouponExpire" />
<result column="status" jdbcType="INTEGER" property="status" />
<result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
<result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
</resultMap>
<sql id="Base_Column_List">
coupon_config_id, enterprise_id, wm_mall_store_id, gic_coupon_id, gic_coupon_name, wm_coupon_id, wm_coupon_name, gic_coupon_expire,
status, create_time, update_time
</sql>
<select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
select
<include refid="Base_Column_List" />
from tab_wm_store_coupon_config
where coupon_config_id = #{couponConfigId,jdbcType=INTEGER}
</select>
<delete id="deleteByPrimaryKey" parameterType="java.lang.Integer">
delete from tab_wm_store_coupon_config
where coupon_config_id = #{couponConfigId,jdbcType=INTEGER}
</delete>
<insert id="insert" parameterType="com.gic.enterprise.entity.TabWmStoreCouponConfig">
insert into tab_wm_store_coupon_config (coupon_config_id, enterprise_id, wm_mall_store_id,
gic_coupon_id, gic_coupon_name, wm_coupon_id, wm_coupon_name, gic_coupon_expire,
status, create_time, update_time
)
values (#{couponConfigId,jdbcType=INTEGER}, #{enterpriseId,jdbcType=INTEGER}, #{wmMallStoreId,jdbcType=INTEGER},
#{gicCouponId,jdbcType=VARCHAR}, #{gicCouponName,jdbcType=VARCHAR}, #{wmCouponId,jdbcType=VARCHAR},
#{wmCouponName,jdbcType=VARCHAR}, #{gicCouponExpire,jdbcType=TIMESTAMP},
#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}
)
</insert>
<insert id="insertSelective" parameterType="com.gic.enterprise.entity.TabWmStoreCouponConfig">
insert into tab_wm_store_coupon_config
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="couponConfigId != null">
coupon_config_id,
</if>
<if test="enterpriseId != null">
enterprise_id,
</if>
<if test="wmMallStoreId != null">
wm_mall_store_id,
</if>
<if test="gicCouponId != null">
gic_coupon_id,
</if>
<if test="gicCouponName != null">
gic_coupon_name,
</if>
<if test="wmCouponId != null">
wm_coupon_id,
</if>
<if test="wmCouponName != null">
wm_coupon_name,
</if>
<if test="gicCouponExpire != null">
gic_coupon_expire,
</if>
<if test="status != null">
status,
</if>
<if test="createTime != null">
create_time,
</if>
<if test="updateTime != null">
update_time,
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="couponConfigId != null">
#{couponConfigId,jdbcType=INTEGER},
</if>
<if test="enterpriseId != null">
#{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMallStoreId != null">
#{wmMallStoreId,jdbcType=INTEGER},
</if>
<if test="gicCouponId != null">
#{gicCouponId,jdbcType=VARCHAR},
</if>
<if test="gicCouponName != null">
#{gicCouponName,jdbcType=VARCHAR},
</if>
<if test="wmCouponId != null">
#{wmCouponId,jdbcType=VARCHAR},
</if>
<if test="wmCouponName != null">
#{wmCouponName,jdbcType=VARCHAR},
</if>
<if test="gicCouponExpire != null">
#{gicCouponExpire,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
#{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
#{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
#{updateTime,jdbcType=TIMESTAMP},
</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.gic.enterprise.entity.TabWmStoreCouponConfig">
update tab_wm_store_coupon_config
<set>
<if test="enterpriseId != null">
enterprise_id = #{enterpriseId,jdbcType=INTEGER},
</if>
<if test="wmMallStoreId != null">
wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
</if>
<if test="gicCouponId != null">
gic_coupon_id = #{gicCouponId,jdbcType=VARCHAR},
</if>
<if test="gicCouponName != null">
gic_coupon_name = #{gicCouponId,jdbcType=VARCHAR},
</if>
<if test="wmCouponId != null">
wm_coupon_id = #{wmCouponId,jdbcType=VARCHAR},
</if>
<if test="wmCouponName != null">
wm_coupon_name = #{wmCouponId,jdbcType=VARCHAR},
</if>
<if test="gicCouponExpire != null">
gic_coupon_expire = #{gicCouponExpire,jdbcType=TIMESTAMP},
</if>
<if test="status != null">
status = #{status,jdbcType=INTEGER},
</if>
<if test="createTime != null">
create_time = #{createTime,jdbcType=TIMESTAMP},
</if>
<if test="updateTime != null">
update_time = #{updateTime,jdbcType=TIMESTAMP},
</if>
</set>
where coupon_config_id = #{couponConfigId,jdbcType=INTEGER}
</update>
<update id="updateByPrimaryKey" parameterType="com.gic.enterprise.entity.TabWmStoreCouponConfig">
update tab_wm_store_coupon_config
set enterprise_id = #{enterpriseId,jdbcType=INTEGER},
wm_mall_store_id = #{wmMallStoreId,jdbcType=INTEGER},
gic_coupon_id = #{gicCouponId,jdbcType=VARCHAR},
gic_coupon_name = #{gicCouponName,jdbcType=VARCHAR},
wm_coupon_id = #{wmCouponId,jdbcType=VARCHAR},
wm_coupon_name = #{wmCouponName,jdbcType=VARCHAR},
gic_coupon_expire = #{gicCouponExpire,jdbcType=TIMESTAMP},
status = #{status,jdbcType=INTEGER},
create_time = #{createTime,jdbcType=TIMESTAMP},
update_time = #{updateTime,jdbcType=TIMESTAMP}
where coupon_config_id = #{couponConfigId,jdbcType=INTEGER}
</update>
<select id="getCouponConfig" resultMap="BaseResultMap" parameterType="com.gic.enterprise.qo.wm.CouponConfigQO">
select <include refid="Base_Column_List"></include>
from tab_wm_store_coupon_config
where status = 1
<if test="wmMallStoreId != null and wmMallStoreId != '' ">
and wm_mall_store_id = #{wmMallStoreId}
</if>
<if test="gicCouponId != null and gicCouponId != '' ">
and gic_coupon_id = #{gicCouponId}
</if>
<if test="wmCouponId != null and wmCouponId != '' ">
and wm_coupon_id = #{wmCouponId}
</if>
<if test="onlyShowEffective != null and onlyShowEffective == 1">
and (gic_coupon_expire is null or TIMESTAMPDIFF(DAY, now(), gic_coupon_expire) >= 0)
</if>
<if test="couponName != null and couponName != '' ">
and (gic_coupon_name like concat('%', #{couponName}, '%') or wm_coupon_name like concat('%', #{couponName}, '%'))
</if>
<if test="orderByCode != null and orderByCode == 1">
order by create_time
</if>
<if test="orderByCode != null and orderByCode == 2">
order by create_time desc
</if>
</select>
</mapper>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment