Skip to content

G
gic-platform-enterprise
Commit 27bc5ab7 by zhiwj
Options

Merge branch 'developer' of… 

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-platform-enterprise into developer

 Conflicts:
	gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/SmsRecordApiServiceImpl.java
parents 75c81970 29416d80
Showing with 106 additions and 107 deletions
gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/QrcodeTypeEnum.java 0 → 100644
package com.gic.enterprise.constant;
/**
* @ClassName:
* @Description: 

* @author guojuxing

* @date 2021/1/5 11:25 AM

*/
public enum QrcodeTypeEnum {
/**
* 门店
*/
STORE(1, "门店"),
/**
* 导购
*/
CLERK(2, "导购"),
/**
* 审核员
*/
AUDITOR(3, "审核员"),
/**
* 管理员
*/
USER(4, "管理员")
;
private Integer code;
private String msg;
QrcodeTypeEnum(Integer code, String msg) {
this.code = code;
this.msg = msg;
}
public Integer getCode() {
return code;
}
public String getMsg() {
return msg;
}
}
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/impl/BillingAccountServiceImpl.java
......@@ -58,7 +58,6 @@ public class BillingAccountServiceImpl implements BillingAccountService{
account.addAndGet(totalFee);
TabBillingAccount tabBillingAccount = tabBillingAccountMapper.selectByEnterpriseId(enterpriseId);
// double newTotal = new BigDecimal(tabBillingAccount.getAccountBalance().toString()).add(new BigDecimal(totalFee + "")).doubleValue();
double newTotal = tabBillingAccount.getAccountBalance() + totalFee;
logger.info("商户：{}, 充值/退款前余额:{}, 充值/退款金额:{}, 充值/退款后余额:{}", enterpriseId, tabBillingAccount.getAccountBalance(), totalFee, newTotal);
UserDTO user = userApiService.getUserByEnterpriseId(enterpriseId).getResult();
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/EnterpriseApiServiceImpl.java
......@@ -659,7 +659,7 @@ public class EnterpriseApiServiceImpl implements EnterpriseApiService {
LOGGER.warn("exception", e);
}
}
return null;
return ServiceResponse.success();
}
@Override
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/SmsRecordApiServiceImpl.java
......@@ -144,35 +144,6 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
@Override
public ServiceResponse<Void> run(String arg) {
/*// 缓存中计费
GicMQClient client = GICMQClientUtil.getClientInstance();
try {
logger.info("国内短信缓存扣费：{}", arg);
SmsRecordDTO smsRecordDTO = JSON.parseObject(arg, SmsRecordDTO.class);
// 判断是扣套餐包还是扣余额
RAtomicLong smsCount = billingEnterpriseSmsPackageService.getTotalSmsInPackageByEnterpriseId(smsRecordDTO.getEnterpriseId());
smsRecordDTO.setCacheStatus(0);
smsRecordDTO.setDatabaseStatus(0);
// 缓存扣费 0套餐包 4余额
Integer fee = accountStandardService.queryUnitFee(smsRecordDTO.getEnterpriseId(), AccountStandardEnum.SMS.getCode());
int deductType = deduct(smsCount, smsRecordDTO.getEnterpriseId(), fee);
smsRecordDTO.setPayType(deductType);
smsRecordDTO.setFee((double)fee/1000);
Long smsRecordId = billingSmsRecordService.saveSmsRecord(smsRecordDTO);
smsRecordDTO.setSmsRecordId(smsRecordId);
billingSmsRecordService.updateCacheStatus(smsRecordDTO.getSmsRecordId());
smsRecordDTO.setCacheStatus(1);
// 队列
client.sendMessage("smsDbMq", JSON.toJSONString(smsRecordDTO));
} catch (Exception e) {
logger.warn("调用mq失败", e);
}
*/
return ServiceResponse.success();
}
......@@ -183,22 +154,13 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
套餐包计费
这里不能改成 decrementAndGet自减， 否则会出现减到0的情况
*/
long curr = rSmsCount.decrementAndGet();
if (curr < 0) {
// 因为并发超扣了 套餐包已经用完 那应该扣账户
billingAccountService.deductAccountByCache(fee.doubleValue() / 1000, enterpriseId);
return 4;
} else {
// 扣套餐包正常
return 0;
}
/*boolean smsCountDeduct = rSmsCount.compareAndSet(smsCount, smsCount - 1);
boolean smsCountDeduct = rSmsCount.compareAndSet(smsCount, smsCount - 1);
if (!smsCountDeduct) {
// 设置失败 重新计算
return deduct(rSmsCount, enterpriseId, fee);
} else {
return 0;
}*/
}
} else {
// 账户计费
billingAccountService.deductAccountByCache(fee.doubleValue() / 1000, enterpriseId);
......@@ -284,18 +246,17 @@ public class SmsRecordApiServiceImpl implements SmsRecordApiService {
* 会员名字和会员卡号
*/
private void setMemberName(SmsRecordDTO smsRecordDTO) {
if (smsRecordDTO == null) {
return;
}
ServiceResponse<MemberUserDTO> memberUserServiceResponse = memberUserApiService.getByMcuId(smsRecordDTO.getMcuId(), smsRecordDTO.getEnterpriseId());
if (memberUserServiceResponse.isSuccess()) {
MemberUserDTO memberUserDTO = memberUserServiceResponse.getResult();
if (memberUserDTO != null) {
smsRecordDTO.setMemberName(memberUserDTO.getName());
smsRecordDTO.setMemberCardName(memberUserDTO.getCardName());
if (smsRecordDTO.getMcuId() != null) {
ServiceResponse<MemberUserDTO> memberUserServiceResponse = memberUserApiService.getByMcuId(smsRecordDTO.getMcuId(), smsRecordDTO.getEnterpriseId());
if (memberUserServiceResponse.isSuccess()) {
MemberUserDTO memberUserDTO = memberUserServiceResponse.getResult();
if (memberUserDTO != null) {
smsRecordDTO.setMemberName(memberUserDTO.getName());
smsRecordDTO.setMemberCardName(memberUserDTO.getCardName());
}
} else {
logger.warn("mcuId:{}, enterpriseId:{}, memberUserApiService.getByMcuId调用失败:{}, ", smsRecordDTO.getMcuId(), smsRecordDTO.getEnterpriseId(), memberUserServiceResponse.getMessage());
}
} else {
logger.warn("mcuId:{}, enterpriseId:{}, memberUserApiService.getByMcuId调用失败:{}, ", smsRecordDTO.getMcuId(), smsRecordDTO.getEnterpriseId(), memberUserServiceResponse.getMessage());
}
}
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/WmStoreApiServiceImpl.java
......@@ -3,12 +3,6 @@ package com.gic.enterprise.service.outer.impl;
import java.util.*;
import java.util.stream.Collectors;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.dto.wm.*;
import com.gic.enterprise.entity.TabWmStoreSyncLog;
import com.gic.enterprise.service.*;
import com.gic.weimob.api.service.WeimobMerchantService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
......@@ -22,16 +16,21 @@ import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.PageHelperUtils;
import com.gic.commons.util.StringUtil;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.MallModeEnum;
import com.gic.enterprise.constant.WmStoreConfigTypeEnum;
import com.gic.enterprise.dto.WmMemberCardConfigDTO;
import com.gic.enterprise.dto.WmOrderConfigDTO;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.dto.wm.*;
import com.gic.enterprise.entity.TabWmStore;
import com.gic.enterprise.entity.TabWmStoreConfig;
import com.gic.enterprise.entity.TabWmStoreCouponConfig;
import com.gic.enterprise.entity.TabWmStoreSyncLog;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import com.gic.enterprise.service.*;
import com.gic.weimob.api.service.WeimobMerchantApiService;
/**
*
* @ClassName: WmStoreApiServiceImpl
......@@ -51,7 +50,7 @@ public class WmStoreApiServiceImpl implements WmStoreApiService {
@Autowired
private WmStoreSyncLogService wmStoreSyncLogService;
@Autowired
private WeimobMerchantService weimobMerchantService;
private WeimobMerchantApiService weimobMerchantService;
@Override
public ServiceResponse<Integer> saveWmStore(WmStoreDTO wmStoreDTO) {
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/OfflineStrategy.java
......@@ -15,7 +15,7 @@ import com.gic.enterprise.entity.TabBillingPayInfo;
import com.gic.enterprise.entity.TabEnterprise;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.*;
import com.gic.enterprise.service.outer.impl.payComplete.PayCompleteHandler;
import com.gic.enterprise.service.outer.impl.paycomplete.PayCompleteHandler;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.finance.dto.TransferAccountsApprovalDTO;
import com.gic.finance.service.TransferAccountsApprovalApiService;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/WxPayStrategy.java
......@@ -17,7 +17,7 @@ import com.gic.enterprise.entity.TabBillingPayInfo;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.BillingPayInfoService;
import com.gic.enterprise.service.EnterpriseApiService;
import com.gic.enterprise.service.outer.impl.payComplete.PayCompleteHandler;
import com.gic.enterprise.service.outer.impl.paycomplete.PayCompleteHandler;
import com.gic.enterprise.utils.CreateRandomUtils;
import com.gic.log.api.dto.SystemSetLogDTO;
import com.gic.log.api.service.LogApiService;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/payComplete/PayCompleteHandler.java → gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/paycomplete/PayCompleteHandler.java
package com.gic.enterprise.service.outer.impl.payComplete;
package com.gic.enterprise.service.outer.impl.paycomplete;
import com.gic.enterprise.dto.ApprovalCallBackDTO;
import com.gic.enterprise.entity.TabBillingPayInfo;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/payComplete/RechargeHandler.java → gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/paycomplete/RechargeHandler.java
package com.gic.enterprise.service.outer.impl.payComplete;
package com.gic.enterprise.service.outer.impl.paycomplete;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
......
gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/payComplete/SmsPackageHandler.java → gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/paycomplete/SmsPackageHandler.java
package com.gic.enterprise.service.outer.impl.payComplete;
package com.gic.enterprise.service.outer.impl.paycomplete;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.dto.UserDTO;
......
gic-platform-enterprise-service/src/main/resources/dubbo-gic-platform-enterprise-service.xml
......@@ -143,7 +143,7 @@
<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" />
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantApiService" id="weimobMerchantService" timeout="6000"/>
<dubbo:reference interface="com.gic.open.api.service.EnterpriseLicenseApiService" id="enterpriseLicenseApiService" timeout="6000" />
<dubbo:reference interface="com.gic.widget.screening.api.service.EsScreeningEnterpriseInitService" id="esScreeningEnterpriseInitService" timeout="6000" />
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmMallStoreController.java
......@@ -5,37 +5,32 @@ import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
import com.gic.api.base.commons.Page;
import com.gic.commons.annotation.HeaderSignIgnore;
import com.gic.enterprise.base.UserInfo;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.error.ErrorCode;
import com.gic.goods.pump.api.service.WeiMobGoodsService;
import com.gic.member.config.api.enums.OrderPointCalculationPartyEnum;
import com.gic.member.config.api.service.OrderPointCalculationPartyApiService;
import com.gic.open.api.dto.EnterpriseServeInfoDTO;
import com.gic.open.api.service.EnterpriseLicenseApiService;
import com.gic.redis.data.util.RedisUtil;
import com.gic.weimob.api.dto.GicMemberGradeDTO;
import com.gic.weimob.api.dto.WeimobCouponTemplateDTO;
import com.gic.weimob.api.service.*;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.annotation.HeaderSignIgnore;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.OperationResultUtils;
import com.gic.enterprise.base.UserInfo;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.MallModeEnum;
import com.gic.enterprise.constant.WmStoreConfigTypeEnum;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.dto.wm.WmStoreConfigDTO;
import com.gic.enterprise.dto.wm.WmStoreCouponConfigDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.qo.wm.CouponConfigQO;
import com.gic.enterprise.service.WmStoreApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
......@@ -43,11 +38,18 @@ import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.enterprise.web.utils.DomainUtils;
import com.gic.enterprise.web.vo.MemberCardVO;
import com.gic.enterprise.web.vo.wm.*;
import com.gic.goods.pump.api.service.WeiMobGoodsService;
import com.gic.marketing.api.dto.coupon.CouponDTO;
import com.gic.marketing.api.service.coupon.MemberCouponApiService;
import com.gic.member.config.api.enums.OrderPointCalculationPartyEnum;
import com.gic.member.config.api.service.MemberCardApiService;
import javax.servlet.http.HttpServletResponse;
import com.gic.member.config.api.service.OrderPointCalculationPartyApiService;
import com.gic.open.api.dto.EnterpriseServeInfoDTO;
import com.gic.open.api.service.EnterpriseLicenseApiService;
import com.gic.weimob.api.service.WeimobBaseApiService;
import com.gic.weimob.api.service.WeimobMemberBaseApiService;
import com.gic.weimob.api.service.WeimobMerchantApiService;
import com.gic.weimob.api.service.WeimobOrderApiService;
/**
*
* @ClassName: WmMallStoreController
......@@ -65,19 +67,19 @@ public class WmMallStoreController {
@Autowired
private MemberCardApiService memberCardApiService;
@Autowired
private WeimobMerchantService weimobMerchantService;
private WeimobMerchantApiService weimobMerchantService;
@Autowired
private MemberCouponApiService memberCouponApiService;
@Autowired
private WeimobMemberService weimobMemberService;
private WeimobMemberBaseApiService weimobMemberService;
@Autowired
private WeimobBaseService weimobBaseService;
private WeimobBaseApiService weimobBaseService;
@Autowired
private WeiMobGoodsService weiMobGoodsService;
@Autowired
private OrderPointCalculationPartyApiService orderPointCalculationPartyApiService;
@Autowired
private WeimobOrderService weimobOrderService;
private WeimobOrderApiService weimobOrderService;
@Autowired
private EnterpriseLicenseApiService enterpriseLicenseApiService;
......
gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/wm/WmStoreSyncController.java
......@@ -11,22 +11,11 @@ import java.util.stream.Collectors;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import com.gic.commons.annotation.HeaderSignIgnore;
import com.gic.commons.util.EntityUtil;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.dto.wm.WmStoreSyncLogDTO;
import com.gic.enterprise.web.vo.wm.WmBranchVO;
import com.gic.weimob.api.dto.WeimobGuiderSynDTO;
import com.gic.weimob.api.dto.WeimobStoreGicInfoDTO;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.hssf.usermodel.HSSFCell;
import org.apache.poi.hssf.usermodel.HSSFRow;
import org.apache.poi.hssf.usermodel.HSSFSheet;
import org.apache.poi.hssf.usermodel.HSSFWorkbook;
import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
import org.apache.poi.ss.usermodel.*;
import org.redisson.api.RMap;
......@@ -43,17 +32,22 @@ import com.alibaba.fastjson.JSON;
import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse;
import com.gic.auth.service.UserApiService;
import com.gic.commons.annotation.HeaderSignIgnore;
import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.GlobalInfo;
import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.download.utils.ExecutorPoolSingleton;
import com.gic.enterprise.constant.Constants;
import com.gic.enterprise.constant.MallModeEnum;
import com.gic.enterprise.dto.WmStoreDTO;
import com.gic.enterprise.dto.wm.WmStoreSyncLogDTO;
import com.gic.enterprise.error.ErrorCode;
import com.gic.enterprise.service.WmStoreApiService;
import com.gic.enterprise.service.WmStoreSyncLogApiService;
import com.gic.enterprise.utils.ResultControllerUtils;
import com.gic.enterprise.utils.UserDetailUtils;
import com.gic.enterprise.web.vo.wm.WeimobStoreClerkLogVO;
import com.gic.enterprise.web.vo.wm.WmBranchVO;
import com.gic.redis.data.util.RedisUtil;
import com.gic.store.dto.*;
import com.gic.store.service.ClerkApiService;
......@@ -61,7 +55,8 @@ import com.gic.store.service.StoreApiService;
import com.gic.store.service.StoreRegionApiService;
import com.gic.weimob.api.dto.WeimobPhysicalStoreDTO;
import com.gic.weimob.api.dto.WeimobStoreAccountDTO;
import com.gic.weimob.api.service.WeimobStoreSiteService;
import com.gic.weimob.api.dto.WeimobStoreGicInfoDTO;
import com.gic.weimob.api.service.WeimobStoreSiteApiService;
/**
* 同步门店to微盟
......@@ -89,7 +84,7 @@ public class WmStoreSyncController {
@Autowired
private WmStoreApiService wmStoreApiService;
@Autowired
private WeimobStoreSiteService weimobStoreSiteService;
private WeimobStoreSiteApiService weimobStoreSiteService;
@Autowired
private StoreApiService storeApiService;
@Autowired
......@@ -577,7 +572,7 @@ public class WmStoreSyncController {
private StoreApiService storeApiService;
private ClerkApiService clerkApiService;
private WmStoreSyncLogApiService wmStoreSyncLogApiService;
private WeimobStoreSiteService weimobStoreSiteService;
private WeimobStoreSiteApiService weimobStoreSiteService;
private Integer enterpriseId;
private List<Map<Integer, String>> data;
......@@ -592,7 +587,7 @@ public class WmStoreSyncController {
public MyTaskOfBranchStore(StoreApiService storeApiService, ClerkApiService clerkApiService,
WmStoreSyncLogApiService wmStoreSyncLogApiService,
WeimobStoreSiteService weimobStoreSiteService, Integer enterpriseId, List<Map<Integer, String>> data,
WeimobStoreSiteApiService weimobStoreSiteService, Integer enterpriseId, List<Map<Integer, String>> data,
Integer headerStoreId, StoreRegionApiService storeRegionApiService, Integer wmMallStoreId,
boolean isBranch, boolean oneAndOne) {
this.storeApiService = storeApiService;
......
gic-platform-enterprise-web/src/main/resources/dubbo-gic-platform-enterprise-web.xml
......@@ -127,11 +127,11 @@
<dubbo:reference interface="com.gic.data.api.service.MemberDataApiService" id="memberDataApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.member.config.api.service.MemberCardApiService" id="memberCardApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteService" id="weimobStoreSiteService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantService" id="weimobMerchantService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderService" id="weimobOrderService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberService" id="weimobMemberService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseService" id="weimobBaseService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobStoreSiteApiService" id="weimobStoreSiteService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMerchantApiService" id="weimobMerchantService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobOrderApiService" id="weimobOrderService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobMemberBaseApiService" id="weimobMemberService" timeout="6000"/>
<dubbo:reference interface="com.gic.weimob.api.service.WeimobBaseApiService" id="weimobBaseService" timeout="6000"/>
<dubbo:reference interface="com.gic.marketing.api.service.coupon.MemberCouponApiService" id="memberCouponApiService" timeout="6000"/>
<dubbo:reference interface="com.gic.store.service.ClerkApiService" id="clerkApiService" timeout="60000" />
......
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