Просмотр исходного кода

bug。。。

release_toaliyun_real
xhxu 4 лет назад
Родитель
Сommit
9af6e71af0
30 измененных файлов: 398 добавлений и 432 удалений
  1. +9
    -9
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
  2. +4
    -4
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  3. +8
    -9
      mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java
  4. +20
    -24
      mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java
  5. +4
    -8
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
  6. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java
  7. +6
    -6
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  8. +2
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  9. +175
    -183
      mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java
  10. +4
    -8
      mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java
  11. +6
    -6
      mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java
  12. +4
    -3
      mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java
  13. +6
    -6
      mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java
  14. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java
  15. +4
    -4
      mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java
  16. +14
    -15
      mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java
  17. +9
    -9
      mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java
  18. +6
    -8
      mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java
  19. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java
  20. +39
    -39
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  21. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java
  22. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java
  23. +29
    -32
      mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java
  24. +5
    -6
      mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java
  25. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
  26. +4
    -4
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java
  27. +8
    -9
      mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java
  28. +4
    -4
      mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java
  29. +4
    -8
      mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
  30. +3
    -3
      mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java

+ 9
- 9
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java Просмотреть файл

@@ -70,11 +70,11 @@ public class WxBrandController extends BaseController {

if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){
//判断是否解绑商户
WxMerchant wxMerchant = new WxMerchant() {{
setIsDel(0);
setBrand(wxBrand.getId());
updateTenantInfo(wxBrand);
}};
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.updateTenantInfo(wxBrand);
wxMerchant.setIsDel(0);
wxMerchant.setBrand(wxBrand.getId());
List<WxMerchant> merchantList = wxMerchantService.findList(wxMerchant);
if(CollectionUtils.isNotEmpty(merchantList)){
return new ResultData(Result.ERROR, "请先删除已绑定该品牌的商户。");
@@ -116,10 +116,10 @@ public class WxBrandController extends BaseController {
@SystemControllerLog(description = "品牌-名称是否存在")
public ResultData hasBrand(String name, Long id) {
logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand");
WxBrand wxBrand = new WxBrand() {{
setName(name);
updateTenantInfo(getTenantInfo());
}};
WxBrand wxBrand = new WxBrand();
wxBrand.updateTenantInfo(getTenantInfo());
wxBrand.setName(name);
wxBrand.setId(id);
return wxBrandService.hasBrand(wxBrand);
}


+ 4
- 4
mallinkAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java Просмотреть файл

@@ -116,10 +116,10 @@ public class WxShopController extends BaseController {
@SystemControllerLog(description = "店铺管理-查询商铺号是否存在")
public ResultData hasShopNumber(String shopNumber, Long id, Integer type) {
logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber");
WxShop wxShop = new WxShop() {{
setShopNumber(shopNumber);
setType(type);
}};
WxShop wxShop = new WxShop();
wxShop.setShopNumber(shopNumber);
wxShop.setType(type);
wxShop.setId(id);
wxShop.updateTenantInfo(getTenantInfo());
return wxShopService.hasShopNumber(wxShop);


+ 8
- 9
mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java Просмотреть файл

@@ -236,15 +236,14 @@ public class WxCarController extends BaseController {
}

// Save to wx_coupon_car
WxCouponCar couponCar = new WxCouponCar() {{
setId(coupon.getId());
updateTenantInfo(tenantEntity);
setParkId(park.getId());
setVendorType(park.getVendorType());
setVendorParams(coupon.getVendorParams());
setCreateDate(curDate);
setUpdateDate(curDate);
}};
WxCouponCar couponCar = new WxCouponCar();
couponCar.setId(coupon.getId());
couponCar.updateTenantInfo(tenantEntity);
couponCar.setParkId(park.getId());
couponCar.setVendorType(park.getVendorType());
couponCar.setVendorParams(coupon.getVendorParams());
couponCar.setCreateDate(curDate);
couponCar.setUpdateDate(curDate);
WxCouponCar newCouponCar = wxCouponCarService.getById(couponCar.getId());
if (newCouponCar == null) {
wxCouponCarService.save(couponCar);


+ 20
- 24
mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java Просмотреть файл

@@ -109,21 +109,19 @@ public class MemCouponController extends BaseController {
if (coupon == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券不存在:" + memCouponFromDsp.getCouponId());
}
MemCouponFromDsp couponQ = new MemCouponFromDsp() {{
updateTenantInfo(memCouponFromDsp);
setCouponId(memCouponFromDsp.getCouponId());
setStatus(0);
}};
MemCouponFromDsp couponQ = new MemCouponFromDsp();
couponQ.updateTenantInfo(memCouponFromDsp);
couponQ.setCouponId(memCouponFromDsp.getCouponId());
couponQ.setStatus(0);
Integer couponCount = memCouponFromDspService.countByInfo(couponQ);
if (coupon.getRemainInventory() <= couponCount) {
return new ResultData(ErrorCode.REMAIN_IS_EMPTY);
}
// 2. 检查此会员是否已超限, 达到券购买限制
couponQ = new MemCouponFromDsp() {{
updateTenantInfo(memCouponFromDsp);
setPhone(memCouponFromDsp.getPhone());
setCouponId(memCouponFromDsp.getCouponId());
}};
couponQ = new MemCouponFromDsp();
couponQ.updateTenantInfo(memCouponFromDsp);
couponQ.setPhone(memCouponFromDsp.getPhone());
couponQ.setCouponId(memCouponFromDsp.getCouponId());
couponCount = memCouponFromDspService.countByInfo(couponQ);
if (coupon.getUseLimitQuantity() <= couponCount) {
return new ResultData(ErrorCode.ORDER_IS_LIMITED);
@@ -152,21 +150,19 @@ public class MemCouponController extends BaseController {
if (coupon == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "券不存在:" + memCouponFromDsp.getCouponId());
}
MemCouponFromDsp couponQ = new MemCouponFromDsp() {{
updateTenantInfo(memCouponFromDsp);
setCouponId(memCouponFromDsp.getCouponId());
setStatus(0);
}};
MemCouponFromDsp couponQ = new MemCouponFromDsp();
couponQ.updateTenantInfo(memCouponFromDsp);
couponQ.setCouponId(memCouponFromDsp.getCouponId());
couponQ.setStatus(0);
Integer couponCount = memCouponFromDspService.countByInfo(couponQ);
if (coupon.getRemainInventory() <= couponCount) {
return new ResultData(ErrorCode.REMAIN_IS_EMPTY);
}
// 2. 检查此会员是否已超限, 达到券购买限制
couponQ = new MemCouponFromDsp() {{
updateTenantInfo(memCouponFromDsp);
setPhone(memCouponFromDsp.getPhone());
setCouponId(memCouponFromDsp.getCouponId());
}};
couponQ = new MemCouponFromDsp();
couponQ.updateTenantInfo(memCouponFromDsp);
couponQ.setPhone(memCouponFromDsp.getPhone());
couponQ.setCouponId(memCouponFromDsp.getCouponId());
couponCount = memCouponFromDspService.countByInfo(couponQ);
if (coupon.getUseLimitQuantity() <= couponCount) {
return new ResultData(ErrorCode.ORDER_IS_LIMITED);
@@ -186,10 +182,10 @@ public class MemCouponController extends BaseController {
if (StringUtils.isEmpty(phone)) {
return new ResultData(new ArrayList<MemCouponFromDsp>());
}
MemCouponFromDsp memQ = new MemCouponFromDsp() {{
updateTenantInfo(getTenantInfo());
setPhone(phone);
}};
MemCouponFromDsp memQ = new MemCouponFromDsp();
memQ.updateTenantInfo(getTenantInfo());
memQ.setPhone(phone);
List<MemCouponFromDsp> memCouponFromDsps = memCouponFromDspService.getList(memQ);
return new ResultData(memCouponFromDsps);
}

+ 4
- 8
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java Просмотреть файл

@@ -83,10 +83,8 @@ public class WxMsgValidationcodeController extends BaseController {
public ResultData sendvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String appid) {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::sendvalidationcode");
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}});
wxMsgValidationcode.setTenantId(tenantId);
wxMsgValidationcode.setParentTenantId(parentTenantId);
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(type);
wxMsgValidationcode.setAppid(appid);
@@ -104,10 +102,8 @@ public class WxMsgValidationcodeController extends BaseController {
public ResultData hasvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String code, String appid) {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::hasvalidationcode");
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}});
wxMsgValidationcode.setTenantId(tenantId);
wxMsgValidationcode.setParentTenantId(parentTenantId);
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(type);
wxMsgValidationcode.setCode(code);


+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/sys/HomeController.java Просмотреть файл

@@ -241,9 +241,9 @@ public class HomeController extends BaseController {
logger.error("appid未找到");
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);
}
TenantEntity tenantEntity = new TenantEntity() {{
setTenantId(appinfo.getTenantId());
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(appinfo.getTenantId());
if (StringUtils.isNotBlank(user.getPhone())) {
// 领导登录
user = mallUserInfoService.getByPhone(user.getPhone(), tenantEntity);


+ 6
- 6
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Просмотреть файл

@@ -244,9 +244,9 @@ public class WxInfoController extends BaseController {
if (wxAppinfo == null) {
return new ResultData(Result.ERROR, "APP无权限");
}
TenantEntity tenantEntity = new TenantEntity() {{
setTenantId(wxAppinfo.getTenantId());
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(wxAppinfo.getTenantId());
try {
Map<String, String> retMap = getOpenIdInfo(appId, code);
String openId = retMap.get("openId");
@@ -362,9 +362,9 @@ public class WxInfoController extends BaseController {
WxMaService wxMaService = getWeappService(appId);

WxAppinfo wxAppinfo = getAppInfo(appId);
TenantEntity tenantEntity = new TenantEntity() {{
setTenantId(wxAppinfo.getTenantId());
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(wxAppinfo.getTenantId());
try {
// 解密
WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv);


+ 2
- 4
mallinkBApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Просмотреть файл

@@ -87,10 +87,8 @@ public class WxMsgValidationcodeController extends BaseController {
@ApiImplicitParam(name = "appid", value = "appid", dataType = "String", paramType = "query", required = true)})
public ResultData hasvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String code, String appid) {
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}});
wxMsgValidationcode.setTenantId(tenantId);
wxMsgValidationcode.setParentTenantId(parentTenantId);
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(EnumMsgModel.VALIDATION_CODE.getCode());
wxMsgValidationcode.setCode(code);


+ 175
- 183
mallinkPosApi/src/main/java/com/iformall/service/impl/PosServiceImpl.java Просмотреть файл

@@ -2089,36 +2089,36 @@ public class PosServiceImpl implements PosService {
WxMerchantBUser merchantBUser,
WxOrder order, Long memId,
Long posPayOrderId, Integer neuPaymentAmount, Date neuPosPayOrderTime) {
WxPayOrder payOrder = new WxPayOrder() {{
Date curDate = new Date();
setTenantId(merchantBUser.getTenantId());
final IdWorker idWorker = IdWorker.get();
Long id = idWorker.nextId();
setId(id);
updateTenantInfo(merchantBUser);
setCUserId(memId);
setOrderId(order.getId());
setCreateTime(curDate);
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(id));
setPayAmount(neuPaymentAmount);
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
setShare(EnumPayShare.NO.getCode());
setPosPayOrderId(posPayOrderId);
setPosPayOrderTime(neuPosPayOrderTime.getTime());
/// TODO
/// setPosPaymentType(EnumNeuPosPamentType.MEM_DISCOUNT.getCode());
setPosPayDes("POS会员折扣支付");
}};
Date curDate = new Date();
final IdWorker idWorker = IdWorker.get();

WxPayOrder payOrder = new WxPayOrder();
payOrder.setId(idWorker.nextId());
payOrder.updateTenantInfo(merchantBUser);
payOrder.setCUserId(memId);
payOrder.setOrderId(order.getId());
payOrder.setCreateTime(curDate);
payOrder.setUpdateTime(curDate);
payOrder.setPayTimeStart(curDate);
payOrder.setPayTimeEnd(curDate);
payOrder.setPayOrderNo(String.valueOf(payOrder.getId()));
payOrder.setPayAmount(neuPaymentAmount);
payOrder.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
payOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
payOrder.setShare(EnumPayShare.NO.getCode());
payOrder.setPosPayOrderId(posPayOrderId);
payOrder.setPosPayOrderTime(neuPosPayOrderTime.getTime());
/// TODO
/// setPosPaymentType(EnumNeuPosPamentType.MEM_DISCOUNT.getCode());
payOrder.setPosPayDes("POS会员折扣支付");

int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString());
throw new MallinkException(ErrorCode.DB_FAIL);
}
return payOrder;

}

/**
@@ -2143,30 +2143,28 @@ public class PosServiceImpl implements PosService {
if (null == payOrderList || payOrderList.size()<=0) {
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
payOrder = new WxPayOrder() {{
Date curDate = new Date();
setId(payOrderId);
setTenantId(merchantBUser.getTenantId());
updateTenantInfo(merchantBUser);
setCUserId(memId);
setBUserId(merchantBUser.getId());
setOrderId(order.getId());
setCreateTime(curDate);
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(payOrderId));
setPayAmount(neuPaymentAmount);
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
setShare(EnumPayShare.NO.getCode());
setPayFrom(EnumPayFrom.POS.getCode());
setPosPayOrderId(posPayOrderId);
setPosPayOrderTime(neuPosPayOrderTime.getTime());
setPosPaymentType(EnumNeuPosPamentType.MEM_COUPON.getCode());
setPosPayDes("POS优惠券支付");
setPosPayOrderNo(posPayOrderNo);
}};
payOrder = new WxPayOrder();
Date curDate = new Date();
payOrder.setId(payOrderId);
payOrder.updateTenantInfo(merchantBUser);
payOrder.setCUserId(memId);
payOrder.setBUserId(merchantBUser.getId());
payOrder.setOrderId(order.getId());
payOrder.setCreateTime(curDate);
payOrder.setUpdateTime(curDate);
payOrder.setPayTimeStart(curDate);
payOrder.setPayTimeEnd(curDate);
payOrder.setPayOrderNo(String.valueOf(payOrderId));
payOrder.setPayAmount(neuPaymentAmount);
payOrder.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
payOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
payOrder.setShare(EnumPayShare.NO.getCode());
payOrder.setPayFrom(EnumPayFrom.POS.getCode());
payOrder.setPosPayOrderId(posPayOrderId);
payOrder.setPosPayOrderTime(neuPosPayOrderTime.getTime());
payOrder.setPosPaymentType(EnumNeuPosPamentType.MEM_COUPON.getCode());
payOrder.setPosPayDes("POS优惠券支付");
payOrder.setPosPayOrderNo(posPayOrderNo);
int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString());
@@ -2240,31 +2238,29 @@ public class PosServiceImpl implements PosService {
if (null == payOrderList || payOrderList.size()<=0) {
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
payOrder = new WxPayOrder() {{
Date curDate = new Date();
setId(payOrderId);
setTenantId(buUser.getTenantId());
updateTenantInfo(buUser);
setCUserId(memId);
setBUserId(buUser.getId());
setOrderId(order.getId());
setCreateTime(curDate);
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(payOrderId));
setPayAmount(neuPaymentAmount);
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
setShare(EnumPayShare.NO.getCode());
setPayFrom(EnumPayFrom.POS.getCode());
setPosPayOrderId(posPayOrderId);
setPosPayOrderTime(neuPosPayOrderTime.getTime());
setPosPaymentType(EnumNeuPosPamentType.MEM_CARD.getCode());
setPosPayDes("POS富茂卡支付");
setPosPayOrderNo(posPayOrderNo);
}};
payOrder = new WxPayOrder();
Date curDate = new Date();
payOrder.setId(payOrderId);
payOrder.setTenantId(buUser.getTenantId());
payOrder.updateTenantInfo(buUser);
payOrder.setCUserId(memId);
payOrder.setBUserId(buUser.getId());
payOrder.setOrderId(order.getId());
payOrder.setCreateTime(curDate);
payOrder.setUpdateTime(curDate);
payOrder.setPayTimeStart(curDate);
payOrder.setPayTimeEnd(curDate);
payOrder.setPayOrderNo(String.valueOf(payOrderId));
payOrder.setPayAmount(neuPaymentAmount);
payOrder.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
payOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
payOrder.setShare(EnumPayShare.NO.getCode());
payOrder.setPayFrom(EnumPayFrom.POS.getCode());
payOrder.setPosPayOrderId(posPayOrderId);
payOrder.setPosPayOrderTime(neuPosPayOrderTime.getTime());
payOrder.setPosPaymentType(EnumNeuPosPamentType.MEM_CARD.getCode());
payOrder.setPosPayDes("POS富茂卡支付");
payOrder.setPosPayOrderNo(posPayOrderNo);
int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString());
@@ -2317,30 +2313,29 @@ public class PosServiceImpl implements PosService {
if (null == payOrderList || payOrderList.size()<=0) {
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
payOrder = new WxPayOrder() {{
Date curDate = new Date();
setId(payOrderId);
setTenantId(buUser.getTenantId());
updateTenantInfo(buUser);
setCUserId(memId);
setOrderId(order.getId());
setCreateTime(curDate);
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(payOrderId));
setPayAmount(neuPaymentAmount);
setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
setShare(EnumPayShare.NO.getCode());
setPayFrom(EnumPayFrom.POS.getCode());
setPosPayOrderId(neuPayOrderId);
setPosPayOrderTime(neuPosPayOrderTime.getTime());
setPosPaymentType(neuPayOrderType);
setPosPayDes("POS支付");
setPosPayOrderNo(neuPayThirdNo);
}};
payOrder = new WxPayOrder();
Date curDate = new Date();
payOrder.setId(payOrderId);
payOrder.setTenantId(buUser.getTenantId());
payOrder.updateTenantInfo(buUser);
payOrder.setCUserId(memId);
payOrder.setOrderId(order.getId());
payOrder.setCreateTime(curDate);
payOrder.setUpdateTime(curDate);
payOrder.setPayTimeStart(curDate);
payOrder.setPayTimeEnd(curDate);
payOrder.setPayOrderNo(String.valueOf(payOrderId));
payOrder.setPayAmount(neuPaymentAmount);
payOrder.setPayVendor(EnumPayWay.PAY_WAY_POS_NEU.getCode());
payOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
payOrder.setShare(EnumPayShare.NO.getCode());
payOrder.setPayFrom(EnumPayFrom.POS.getCode());
payOrder.setPosPayOrderId(neuPayOrderId);
payOrder.setPosPayOrderTime(neuPosPayOrderTime.getTime());
payOrder.setPosPaymentType(neuPayOrderType);
payOrder.setPosPayDes("POS支付");
payOrder.setPosPayOrderNo(neuPayThirdNo);

int sqlRow = payOrderMapper.insert(payOrder);
if (sqlRow != 1) {
logger.error("pay order insert error: " + payOrder.toString());
@@ -2386,13 +2381,12 @@ public class PosServiceImpl implements PosService {
String neuRefundThirdNo) {
// 1. pay order
// 查找支付订单
WxPayOrder payOrderQ = new WxPayOrder() {{
updateTenantInfo(refundOrder);
setCUserId(refundOrder.getCUserId());
setOrderId(refundOrder.getId());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
setPosPayOrderId(posPayOrderId);
}};
WxPayOrder payOrderQ = new WxPayOrder();
payOrderQ.updateTenantInfo(refundOrder);
payOrderQ.setCUserId(refundOrder.getCUserId());
payOrderQ.setOrderId(refundOrder.getId());
payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode());
payOrderQ.setPosPayOrderId(posPayOrderId);

try {
payOrderQ = payOrderMapper.selectOne(new QueryWrapper<>(payOrderQ));
@@ -2406,31 +2400,30 @@ public class PosServiceImpl implements PosService {
// 2. insert into refund order
final IdWorker idWorker = IdWorker.get();
Long refundId = idWorker.nextId();
WxRefundOrder refundPayOrder = new WxRefundOrder() {{
Date curDate = new Date();
setId(refundId);
setRefundId(String.valueOf(refundId));
setTenantId(buUser.getTenantId());
updateTenantInfo(buUser);
setCUserId(memId);
setOrderId(refundOrder.getId());
setCreateTime(curDate);
setUpdateTime(curDate);
setRefundTimeStart(curDate);
setRefundTimeEnd(curDate);
setTotalFee(posRefundAmount);
setRefundFee(posRefundAmount);
setRefundFrom(EnumPayFrom.POS.getCode());
setRefundOrderStatus(EnumRefundStatus.REFUND_SUCCESS.getCode());
setPosPayOrderId(posPayOrderId);
setPosRefundOrderId(posRefundOrderId);
setPosRefundOrderTime(posRefundOrderTime.getTime());
setPosRefundOrderStatus(posRefundOrderStatus);
setPosRefundType(posRefundType);
setPosRefundDes("POS退款");
setPosRefundOrderNo(neuRefundThirdNo);

}};
WxRefundOrder refundPayOrder = new WxRefundOrder();

Date curDate = new Date();
refundPayOrder.setId(refundId);
refundPayOrder.setRefundId(String.valueOf(refundId));
refundPayOrder.setTenantId(buUser.getTenantId());
refundPayOrder.updateTenantInfo(buUser);
refundPayOrder.setCUserId(memId);
refundPayOrder.setOrderId(refundOrder.getId());
refundPayOrder.setCreateTime(curDate);
refundPayOrder.setUpdateTime(curDate);
refundPayOrder.setRefundTimeStart(curDate);
refundPayOrder.setRefundTimeEnd(curDate);
refundPayOrder.setTotalFee(posRefundAmount);
refundPayOrder.setRefundFee(posRefundAmount);
refundPayOrder.setRefundFrom(EnumPayFrom.POS.getCode());
refundPayOrder.setRefundOrderStatus(EnumRefundStatus.REFUND_SUCCESS.getCode());
refundPayOrder.setPosPayOrderId(posPayOrderId);
refundPayOrder.setPosRefundOrderId(posRefundOrderId);
refundPayOrder.setPosRefundOrderTime(posRefundOrderTime.getTime());
refundPayOrder.setPosRefundOrderStatus(posRefundOrderStatus);
refundPayOrder.setPosRefundType(posRefundType);
refundPayOrder.setPosRefundDes("POS退款");
refundPayOrder.setPosRefundOrderNo(neuRefundThirdNo);
refundPayOrder.setPayOrderNo(String.valueOf(payOrderQ.getId()));

int sqlRow = refundOrderMapper.insert(refundPayOrder);
@@ -2457,12 +2450,12 @@ public class PosServiceImpl implements PosService {
final Long posOrderId, final Integer posAmount, final Date posOrderTime, final String orderCreateSn
) {
boolean isExist = true;
WxOrder orderQ = new WxOrder() {{
setType(EnumOrderType.POSPAY.getCode());
setCUserId(memId);
setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
setPosOrderId(posOrderId);
}};
WxOrder orderQ = new WxOrder();
orderQ.setType(EnumOrderType.POSPAY.getCode());
orderQ.setCUserId(memId);
orderQ.setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
orderQ.setPosOrderId(posOrderId);
try {
orderQ = orderMapper.selectOne(new QueryWrapper<>(orderQ));
} catch (Exception e) {
@@ -2475,25 +2468,25 @@ public class PosServiceImpl implements PosService {
}
final IdWorker idWorker = IdWorker.get();
Long orderId = idWorker.nextId();
WxOrder order = new WxOrder() {{
Date curr = new Date();
String bodyStr = "POS支付, 金额: " + posAmount;
setId(orderId);
updateTenantInfo(merchantBUser);
setOrderNumber(orderId);
setType(EnumOrderType.POSPAY.getCode());
setProductId(merchantBUser.getId());
setCUserId(memId);
setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
setPayment(posAmount);
setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
setDetail(bodyStr);
setCreateDate(curr);
setUpdateDate(curr);
setPosOrderId(posOrderId);
setPosOrderCreateTime(posOrderTime.getTime());
setPosOrderCreateSn(orderCreateSn);
}};
WxOrder order = new WxOrder();
Date curr = new Date();
String bodyStr = "POS支付, 金额: " + posAmount;
order.setId(orderId);
order.updateTenantInfo(merchantBUser);
order.setOrderNumber(orderId);
order.setType(EnumOrderType.POSPAY.getCode());
order.setProductId(merchantBUser.getId());
order.setCUserId(memId);
order.setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
order.setPayment(posAmount);
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PAYMENT_SUCCESS.getCode());
order.setDetail(bodyStr);
order.setCreateDate(curr);
order.setUpdateDate(curr);
order.setPosOrderId(posOrderId);
order.setPosOrderCreateTime(posOrderTime.getTime());
order.setPosOrderCreateSn(orderCreateSn);

try {
orderMapper.insert(order);
@@ -2519,12 +2512,12 @@ public class PosServiceImpl implements PosService {
final Long posOrderId, final Integer orderAmount, final Date posOrderTime, final String orderCreateSn
) {
// 1. 查找正向订单
WxOrder orderQ = new WxOrder() {{
setType(EnumOrderType.POSPAY.getCode());
setCUserId(memId);
setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
setPosOrderId(posOrderId);
}};
WxOrder orderQ = new WxOrder();
orderQ.setType(EnumOrderType.POSPAY.getCode());
orderQ.setCUserId(memId);
orderQ.setPaymentType(EnumPayType.PAY_PAYMENT.getCode());
orderQ.setPosOrderId(posOrderId);
try {
orderQ = orderMapper.selectOne(new QueryWrapper<>(orderQ));
} catch (Exception e) {
@@ -2536,11 +2529,10 @@ public class PosServiceImpl implements PosService {
}

// 2. 查找是否有退款订单
WxOrder refundQ = new WxOrder() {{
setType(EnumOrderType.POSPAY.getCode());
setCUserId(memId);
setPosOrderId(posOrderId);
}};
WxOrder refundQ = new WxOrder();
refundQ.setType(EnumOrderType.POSPAY.getCode());
refundQ.setCUserId(memId);
refundQ.setPosOrderId(posOrderId);
refundQ.setOrderNumber(orderQ.getOrderNumber());
try {
refundQ = orderMapper.selectOne(new QueryWrapper<>(refundQ));
@@ -2555,24 +2547,24 @@ public class PosServiceImpl implements PosService {
// 3. 创建退款订单
final IdWorker idWorker = IdWorker.get();
Long orderId = idWorker.nextId();
WxOrder order = new WxOrder() {{
Date curr = new Date();
String bodyStr = "POS退款, 金额: " + orderAmount;
setId(orderId);
updateTenantInfo(buUser);
setType(EnumOrderType.POSPAY.getCode());
setProductId(buUser.getId());
setCUserId(memId);
setPaymentType(EnumPayType.PAY_POS_REFUND.getCode());
setPayment(orderAmount);
setOrderStatus(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode());
setDetail(bodyStr);
setCreateDate(curr);
setUpdateDate(curr);
setPosOrderId(posOrderId);
setPosOrderCreateTime(posOrderTime.getTime());
setPosOrderCreateSn(orderCreateSn);
}};
WxOrder order = new WxOrder();
Date curr = new Date();
String bodyStr = "POS退款, 金额: " + orderAmount;
order.setId(orderId);
order.updateTenantInfo(buUser);
order.setType(EnumOrderType.POSPAY.getCode());
order.setProductId(buUser.getId());
order.setCUserId(memId);
order.setPaymentType(EnumPayType.PAY_POS_REFUND.getCode());
order.setPayment(orderAmount);
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_REFUND_SUCCESS.getCode());
order.setDetail(bodyStr);
order.setCreateDate(curr);
order.setUpdateDate(curr);
order.setPosOrderId(posOrderId);
order.setPosOrderCreateTime(posOrderTime.getTime());
order.setPosOrderCreateSn(orderCreateSn);
order.setOrderNumber(orderQ.getOrderNumber());

try {


+ 4
- 8
mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java Просмотреть файл

@@ -68,10 +68,8 @@ public class BillNotificationSchedule {
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode());
wxMsgRecord.setReceiver(phone);
wxMsgRecord.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}});
wxMsgRecord.setTenantId(tenantId);
wxMsgRecord.setParentTenantId(parentTenantId);
Map<String, String> map = new HashedMap();
map.put("price", price.toString());
map.put("app", appname);
@@ -101,10 +99,8 @@ public class BillNotificationSchedule {
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode());
wxMsgRecord.setReceiver(phone);
wxMsgRecord.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}});
wxMsgRecord.setTenantId(tenantId);
wxMsgRecord.setParentTenantId(parentTenantId);
Map<String, String> map = new HashedMap();
map.put("price", price.toString());
map.put("app", appname);


+ 6
- 6
mallinkSchedule/src/main/java/com/iformall/schedule/WxAppVisitSchedule.java Просмотреть файл

@@ -57,9 +57,9 @@ public class WxAppVisitSchedule {
if(StringUtils.isBlank(app.getAppId())||StringUtils.isBlank(app.getSecret())||StringUtils.isBlank(app.getTenantId())) {
continue;
}
TenantEntity TenantEntity = new TenantEntity(){{
setTenantId(app.getTenantId());
}};
TenantEntity TenantEntity = new TenantEntity();
TenantEntity.setTenantId(app.getTenantId());
WxMall byTenantInfo = wxMallService.getByTenantInfo(TenantEntity);
if(byTenantInfo != null && StringUtils.isNotBlank(byTenantInfo.getParentTenantId())){
app.setParentTenantId(byTenantInfo.getParentTenantId());
@@ -89,9 +89,9 @@ public class WxAppVisitSchedule {
if(StringUtils.isBlank(appinfo.getAppId())||StringUtils.isBlank(appinfo.getSecret())||StringUtils.isBlank(appinfo.getTenantId())) {
continue;
}
TenantEntity TenantEntity = new TenantEntity(){{
setTenantId(appinfo.getTenantId());
}};
TenantEntity TenantEntity = new TenantEntity();
TenantEntity.setTenantId(appinfo.getTenantId());
WxMall byTenantInfo = wxMallService.getByTenantInfo(TenantEntity);
if(byTenantInfo != null && StringUtils.isNotBlank(byTenantInfo.getParentTenantId())){
appinfo.setParentTenantId(byTenantInfo.getParentTenantId());


+ 4
- 3
mallinkService/src/main/java/com/iformall/domain/po/base/BaseTenantEntity.java Просмотреть файл

@@ -66,9 +66,10 @@ public class BaseTenantEntity extends BaseEntity {
}

public TenantEntity getTenantInfo() {
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
return tenantEntity;
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);
return tenantEntity;
}

public String getTenantId() {


+ 6
- 6
mallinkService/src/main/java/com/iformall/domain/po/base/TenantVEntity.java Просмотреть файл

@@ -42,12 +42,12 @@ public class TenantVEntity extends BaseEntity {
}

public TenantEntity getTenantInfo() {
return new TenantEntity() {{
setTenantId(tenantId);
if (StringUtils.isNotBlank(parentTenantId)) {
setParentTenantId(parentTenantId);
}
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
if (StringUtils.isNotBlank(parentTenantId)) {
tenantEntity.setParentTenantId(parentTenantId);
}
return tenantEntity;
}

public String getTenantId() {


+ 4
- 4
mallinkService/src/main/java/com/iformall/domain/po/msg/BaseMsg.java Просмотреть файл

@@ -67,10 +67,10 @@ public class BaseMsg extends BaseEntity {
}

public TenantEntity getTenantInfo() {
return new TenantEntity() {{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);
return tenantEntity;
}

public String getFinalTenantId() {


+ 4
- 4
mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsg.java Просмотреть файл

@@ -92,9 +92,9 @@ public class WxMsg extends BaseMsg {
}

public TenantEntity getTenantInfo() {
return new TenantEntity() {{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);
return tenantEntity;
}
}

+ 14
- 15
mallinkService/src/main/java/com/iformall/service/impl/MallPermissionServiceImpl.java Просмотреть файл

@@ -77,14 +77,13 @@ public class MallPermissionServiceImpl implements MallPermissionService {
public List<Long> queryAdminMenuList(MallUserInfo userInfo) {
if(userInfo.fmSuperAdmin() ||
userInfo.getIsAdmin().equals(EnumUserAdmin.ADMIN.getCode())) {
WxMall q = new WxMall() {{
if (StringUtils.isBlank(userInfo.getParentTenantId())) {
setTenantId(userInfo.getTenantId());
} else {
setTenantId(userInfo.getTenantId());
setParentTenantId(userInfo.getParentTenantId());
}
}};
WxMall q = new WxMall();
if (StringUtils.isBlank(userInfo.getParentTenantId())) {
q.setTenantId(userInfo.getTenantId());
} else {
q.setTenantId(userInfo.getTenantId());
q.setParentTenantId(userInfo.getParentTenantId());
}
String menus = wxMallMapper.queryMenusByTenantInfo(q);
JSONArray menuIdList = JSON.parseArray(menus);
return menuIdList.toJavaList(Long.class);
@@ -122,9 +121,9 @@ public class MallPermissionServiceImpl implements MallPermissionService {
} else if (userInfo.checkGroupAdmin()) {
// 集团超管
// if (boolNav) {
WxMall q = new WxMall() {{
setTenantId(userInfo.getTenantId());
}};
WxMall q = new WxMall();
q.setTenantId(userInfo.getTenantId());
String menus = wxMallMapper.queryMenusByTenantInfo(q);
JSONArray menuIdList = JSON.parseArray(menus);
return getAllMenuListByParentId(0L, menuIdList.toJavaList(Long.class), boolNav);
@@ -134,10 +133,10 @@ public class MallPermissionServiceImpl implements MallPermissionService {
// }
} else if (userInfo.checkAdmin()) {
// 租户超管
WxMall q = new WxMall() {{
setTenantId(userInfo.getTenantId());
setParentTenantId(userInfo.getParentTenantId());
}};
WxMall q = new WxMall();
q.setTenantId(userInfo.getTenantId());
q.setParentTenantId(userInfo.getParentTenantId());
String menus = wxMallMapper.queryMenusByTenantInfo(q);
JSONArray menuIdList = JSON.parseArray(menus);
if (null != menuIdList) {


+ 9
- 9
mallinkService/src/main/java/com/iformall/service/impl/MemCouponFromDspServiceImpl.java Просмотреть файл

@@ -95,11 +95,11 @@ public class MemCouponFromDspServiceImpl implements MemCouponFromDspService {
user.setOperatorType(EnumUserType.MALLUSER.getCode());
user.setOperatorId(user.getId());
// 手机是否有未注的券
MemCouponFromDsp memQ = new MemCouponFromDsp() {{
updateTenantInfo(record);
setPhone(record.getPhone());
setStatus(EnumCouponDspStatus.RECEIVED.getCode());
}};
MemCouponFromDsp memQ = new MemCouponFromDsp();
memQ.updateTenantInfo(record);
memQ.setPhone(record.getPhone());
memQ.setStatus(EnumCouponDspStatus.RECEIVED.getCode());
List<MemCouponFromDsp> couponFromDsps = memCouponFromDspMapper.findList(memQ);
for (MemCouponFromDsp memCouponFromDsp: couponFromDsps) {
// 注入券码, 无论此券是有价还是免费
@@ -128,10 +128,10 @@ public class MemCouponFromDspServiceImpl implements MemCouponFromDspService {

@Override
public void couponOrderFromDsp(TenantEntity tenantEntity, String phone) {
List<MemCouponFromDsp> couponFromDsps = getList( new MemCouponFromDsp() {{
updateTenantInfo(tenantEntity);
setPhone(phone);
}});
MemCouponFromDsp mcfdQ= new MemCouponFromDsp();
mcfdQ.updateTenantInfo(tenantEntity);
mcfdQ.setPhone(phone);
List<MemCouponFromDsp> couponFromDsps = getList(mcfdQ);
for(MemCouponFromDsp memCouponFromDsp: couponFromDsps ){
couponOrder(memCouponFromDsp);
}


+ 6
- 8
mallinkService/src/main/java/com/iformall/service/impl/WxBillAllServiceImpl.java Просмотреть файл

@@ -1646,10 +1646,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
String manager = (String) mapList.get(0).get("manager");
String managerPhone = (String) mapList.get(0).get("managerPhone");

TenantEntity tenantEntity = new TenantEntity() {{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);

String billListStr = "";
BigDecimal sumNeedPay = new BigDecimal(0);
@@ -1707,10 +1706,9 @@ public class WxBillAllServiceImpl implements WxBillAllService {
String managerPhone = (String) mapList.get(0).get("managerPhone");
Long expiredDay = (Long) mapList.get(0).get("expiredDay");

TenantEntity tenantEntity = new TenantEntity() {{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(tenantId);
tenantEntity.setParentTenantId(parentTenantId);

String billListStr = "";
BigDecimal sumNeedPay = new BigDecimal(0);


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxBrandServiceImpl.java Просмотреть файл

@@ -99,9 +99,9 @@ public class WxBrandServiceImpl implements WxBrandService {

@Override
public List<Map<String,Object>> queryBrand(TenantEntity tenantEntity) {
WxBrand wxBrand = new WxBrand() {{
updateTenantInfo(tenantEntity);
}};
WxBrand wxBrand = new WxBrand();
wxBrand.updateTenantInfo(tenantEntity);
return wxBrandMapper.queryBrandByTenant(wxBrand);
}



+ 39
- 39
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -816,10 +816,11 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {

// 4. get user info
WxCUser user = null;
List<WxCUser> list = wxCUserMapper.findList(new WxCUser(){{
updateTenantInfo(bUser);
setUserId(couponOrder.getCUserId());
}});

WxCUser wcuQ = new WxCUser();
wcuQ.updateTenantInfo(bUser);
wcuQ.setUserId(couponOrder.getCUserId());
List<WxCUser> list = wxCUserMapper.findList(wcuQ);
if(list != null && list.size() > 0){
user = list.get(0);
}
@@ -1447,45 +1448,44 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
// 添加payOrder
final IdWorker idWorker = IdWorker.get();
Long payOrderId = idWorker.nextId();
WxPayOrder payOrder = new WxPayOrder() {{
Date curDate = new Date();
setId(payOrderId);
updateTenantInfo(microOrder);
setCUserId(microOrder.getCUserId());
setOrderId(microOrder.getId());
setCreateTime(curDate);
setUpdateTime(curDate);
setPayTimeStart(curDate);
setPayTimeEnd(curDate);
setPayOrderNo(String.valueOf(payOrderId));
setIp(ipstr);
setAuthCode(authCode);
Integer payAmount = microOrder.getPayment() - wxCoupon.getPrice();
setPayAmount(payAmount);
WxPayOrder payOrder = new WxPayOrder();
Date curDate = new Date();
payOrder.setId(payOrderId);
payOrder.updateTenantInfo(microOrder);
payOrder.setCUserId(microOrder.getCUserId());
payOrder.setOrderId(microOrder.getId());
payOrder.setCreateTime(curDate);
payOrder.setUpdateTime(curDate);
payOrder.setPayTimeStart(curDate);
payOrder.setPayTimeEnd(curDate);
payOrder.setPayOrderNo(String.valueOf(payOrderId));
payOrder.setIp(ipstr);
payOrder.setAuthCode(authCode);
Integer payAmount = microOrder.getPayment() - wxCoupon.getPrice();
payOrder.setPayAmount(payAmount);
// if (microOrder.getPayment() > wxCoupon.getPrice()) {
// setPayAmount(wxCoupon.getPrice());
// payOrder.setPayAmount(wxCoupon.getPrice());
// } else {
// setPayAmount(microOrder.getPayment());
// payOrder.setPayAmount(microOrder.getPayment());
// }
setPayVendor(payWay.getCode());
setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode());
setShare(shareCode);
if (shareCode.intValue() == EnumPayShare.YES.getCode().intValue()) {
// 分账金额
int iChargeFee = PayUtils.getPayRate(payAmount, payAccount.getRate(), false);
Integer share_amount = payAmount - iChargeFee;
setShareAmount(share_amount);
if(payAccount.getRealRate() != null) {
int iRealChargeFee = PayUtils.getPayRate(payAmount, payAccount.getRealRate(), true);
setRateAmount(iRealChargeFee);
}
if (share_amount <= 0) {
setShare(EnumPayShare.NO.getCode());
}
payOrder.setPayVendor(payWay.getCode());
payOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_WAIT.getCode());
payOrder.setShare(shareCode);
if (shareCode.intValue() == EnumPayShare.YES.getCode().intValue()) {
// 分账金额
int iChargeFee = PayUtils.getPayRate(payAmount, payAccount.getRate(), false);
Integer share_amount = payAmount - iChargeFee;
payOrder.setShareAmount(share_amount);
if(payAccount.getRealRate() != null) {
int iRealChargeFee = PayUtils.getPayRate(payAmount, payAccount.getRealRate(), true);
payOrder.setRateAmount(iRealChargeFee);
}
if (share_amount <= 0) {
payOrder.setShare(EnumPayShare.NO.getCode());
}
setPayFrom(EnumPayFrom.INSIDE_B.getCode());
setPosPayOrderId(couponOrder.getId());
}};
}
payOrder.setPayFrom(EnumPayFrom.INSIDE_B.getCode());
payOrder.setPosPayOrderId(couponOrder.getId());

try {
payOrderMapper.insert(payOrder);


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java Просмотреть файл

@@ -440,10 +440,10 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {

private void sendMsgForSendCoupon(TenantEntity tenantEntity, WxCouponSend send, WxCouponOrder couponOrder, WxCUserBasicInfo user) {

List<WxCUser> list = wxCUserMapper.findList(new WxCUser(){{
updateTenantInfo(tenantEntity);
setUserId(couponOrder.getCUserId());
}});
WxCUser wcuQ = new WxCUser();
wcuQ.updateTenantInfo(tenantEntity);
wcuQ.setUserId(couponOrder.getCUserId());
List<WxCUser> list = wxCUserMapper.findList(wcuQ);
if(list != null && list.size() > 0){
for (WxCUser cuser:list) {
//发订阅消息


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java Просмотреть файл

@@ -332,9 +332,9 @@ public class WxCouponServiceImpl implements WxCouponService {
//有价券判断商户是否配置了分账账号
if (record.getSalePrice() != null && record.getSalePrice() > 0) {
boolean share = false;
WxPayAccount payQ = new WxPayAccount() {{
updateTenantInfo(record);
}};
WxPayAccount payQ = new WxPayAccount();
payQ.updateTenantInfo(record);
try {
WxPayAccount payAccount = payAccountMapper.selectOne(new QueryWrapper<>(payQ));
if (payAccount != null) {


+ 29
- 32
mallinkService/src/main/java/com/iformall/service/impl/WxMallBuildingServiceImpl.java Просмотреть файл

@@ -172,23 +172,22 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService {
String [] floors = record.getFloors().split(",");

// 楼座
WxMallBuilding mallBuilding = new WxMallBuilding() {{
setId(idWorker.nextId());
updateTenantInfo(record);
setName(record.getBuilding());
setFloorNumber(floors.size());
}};
WxMallBuilding mallBuilding = new WxMallBuilding();
mallBuilding.setId(idWorker.nextId());
mallBuilding.updateTenantInfo(record);
mallBuilding.setName(record.getBuilding());
mallBuilding.setFloorNumber(floors.length);
wxMallBuildingMapper.insert(mallBuilding);

// 楼层
for(String floor: floors) {
WxMallFloor mallFloor = new WxMallFloor() {{
setId(idWorker.nextId());
updateTenantInfo(record);
setBuildingId(mallBuilding.getId());
setFloorName(floor);
setBackgroundImg(Constant.floor_back_img);
}};
WxMallFloor mallFloor = new WxMallFloor();
mallFloor.setId(idWorker.nextId());
mallFloor.updateTenantInfo(record);
mallFloor.setBuildingId(mallBuilding.getId());
mallFloor.setFloorName(floor);
mallFloor.setBackgroundImg(Constant.floor_back_img);
wxMallFloorMapper.insert(mallFloor);
}

@@ -199,16 +198,15 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService {

@Override
public void saveFloorArea(WxMallFloor record) {
WxMallFloor mallFloor = new WxMallFloor() {{
setId(record.getId());
updateTenantInfo(record);
if (record.getTotalArea() != null) {
setTotalArea(record.getTotalArea());
}
if (record.getOperatingArea() != null) {
setOperatingArea(record.getOperatingArea());
}
}};
WxMallFloor mallFloor = new WxMallFloor();
mallFloor.setId(record.getId());
mallFloor.updateTenantInfo(record);
if (record.getTotalArea() != null) {
mallFloor.setTotalArea(record.getTotalArea());
}
if (record.getOperatingArea() != null) {
mallFloor.setOperatingArea(record.getOperatingArea());
}
wxMallFloorMapper.updateById(mallFloor);

String key = Constant.mallBuildingPrev + record.getTenantId();
@@ -222,15 +220,14 @@ public class WxMallBuildingServiceImpl implements WxMallBuildingService {

@Override
public void saveFloorImg(WxMallFloor record) {
WxMallFloor mallFloor = new WxMallFloor() {{
setId(record.getId());
updateTenantInfo(record);
if(record.getFloorMaps() == null || record.getFloorMaps().size() == 0){
setFloorMap("[]");
}else{
setFloorMap(JSON.toJSONString(record.getFloorMaps()));
}
}};
WxMallFloor mallFloor = new WxMallFloor();
mallFloor.setId(record.getId());
mallFloor.updateTenantInfo(record);
if(record.getFloorMaps() == null || record.getFloorMaps().size() == 0){
mallFloor.setFloorMap("[]");
}else{
mallFloor.setFloorMap(JSON.toJSONString(record.getFloorMaps()));
}
wxMallFloorMapper.updateById(mallFloor);
}



+ 5
- 6
mallinkService/src/main/java/com/iformall/service/impl/WxMallServiceImpl.java Просмотреть файл

@@ -143,9 +143,8 @@ public class WxMallServiceImpl implements WxMallService {
if (mall == null) {
return null;
}
WxMallBuilding wxMallBuilding = new WxMallBuilding() {{
updateTenantInfo(tenantEntity);
}};
WxMallBuilding wxMallBuilding = new WxMallBuilding();
wxMallBuilding.updateTenantInfo(tenantEntity);
List<WxMallBuilding> buildings = wxMallBuildingMapper.findList(wxMallBuilding);
List<WxMallBuilding> wxMallBuildings = buildings.stream().map(b -> {
WxMallBuilding tempb = new WxMallBuilding();
@@ -238,9 +237,9 @@ public class WxMallServiceImpl implements WxMallService {
@Override
public void undateSubmall(String parentTenantId, List<String> tenantIds) {
wxMallMapper.undateSubmall(parentTenantId, tenantIds);
this.deleteRedis(new TenantEntity(){{
setTenantId(parentTenantId);
}});
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(parentTenantId);
this.deleteRedis(tenantEntity);
}

@Override


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java Просмотреть файл

@@ -217,10 +217,10 @@ public class WxMsgServiceImpl implements WxMsgService {

@Override
public ResultData add(WxMsg wxMsg){
TenantEntity tenantEntity = new TenantEntity() {{
setTenantId(wxMsg.getTenantId());
setParentTenantId(wxMsg.getParentTenantId());
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(wxMsg.getTenantId());
tenantEntity.setParentTenantId(wxMsg.getParentTenantId());
//不是草稿检验疲劳度
if (!wxMsg.getStatus().equals(EnumMsgStatus.MSG_STATUS_DRAFT.getCode())) {
if (wxMsg.getIsright().equals(EnumMsgSend.MSG_SEND_IMMEDIATELY.getCode())) {


+ 4
- 4
mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java Просмотреть файл

@@ -163,10 +163,10 @@ public class WxOrderPressServiceImpl implements WxOrderPressService {
}
// 3. get user info
WxCUser user = null;
List<WxCUser> list = userMapper.findList(new WxCUser(){{
updateTenantInfo(order);
setUserId(order.getCUserId());
}});
WxCUser wcuQ = new WxCUser();
wcuQ.updateTenantInfo(order);
wcuQ.setUserId(order.getCUserId());
List<WxCUser> list = userMapper.findList(wcuQ);
if(list != null && list.size() > 0){
user = list.get(0);
}


+ 8
- 9
mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxBrandController.java Просмотреть файл

@@ -70,11 +70,11 @@ public class WxBrandController extends BaseController {

if(EnumDelFlag.YES.getCode().equals(wxBrand.getIsDel())){
//判断是否解绑商户
WxMerchant wxMerchant = new WxMerchant() {{
setIsDel(0);
setBrand(wxBrand.getId());
updateTenantInfo(wxBrand);
}};
WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setIsDel(0);
wxMerchant.setBrand(wxBrand.getId());
wxMerchant.updateTenantInfo(wxBrand);
List<WxMerchant> merchantList = wxMerchantService.findList(wxMerchant);
if(CollectionUtils.isNotEmpty(merchantList)){
return new ResultData(Result.ERROR, "请先删除已绑定该品牌的商户。");
@@ -116,10 +116,9 @@ public class WxBrandController extends BaseController {
@SystemControllerLog(description = "品牌-名称是否存在")
public ResultData hasBrand(String name, Long id) {
logger.debug("[" + getIpAddr() + "] WxBrandController::hasBrand");
WxBrand wxBrand = new WxBrand() {{
setName(name);
updateTenantInfo(getTenantInfo());
}};
WxBrand wxBrand = new WxBrand();
wxBrand.updateTenantInfo(getTenantInfo());
wxBrand.setName(name);
wxBrand.setId(id);
return wxBrandService.hasBrand(wxBrand);
}


+ 4
- 4
mallinkTTAdmin/src/main/java/com/iformall/controller/basic/WxShopController.java Просмотреть файл

@@ -116,10 +116,10 @@ public class WxShopController extends BaseController {
@SystemControllerLog(description = "店铺管理-查询商铺号是否存在")
public ResultData hasShopNumber(String shopNumber, Long id, Integer type) {
logger.debug("[" + getIpAddr() + "] WxShopController::hasShopNumber");
WxShop wxShop = new WxShop() {{
setShopNumber(shopNumber);
setType(type);
}};
WxShop wxShop = new WxShop();
wxShop.setShopNumber(shopNumber);
wxShop.setType(type);
wxShop.setId(id);
wxShop.updateTenantInfo(getTenantInfo());
return wxShopService.hasShopNumber(wxShop);


+ 4
- 8
mallinkTTAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java Просмотреть файл

@@ -83,10 +83,8 @@ public class WxMsgValidationcodeController extends BaseController {
public ResultData sendvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String appid) {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::sendvalidationcode");
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}});
wxMsgValidationcode.setTenantId(tenantId);
wxMsgValidationcode.setParentTenantId(parentTenantId);
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(type);
wxMsgValidationcode.setAppid(appid);
@@ -104,10 +102,8 @@ public class WxMsgValidationcodeController extends BaseController {
public ResultData hasvalidationcode(String tenantId, String parentTenantId, String phone, Integer type, String code, String appid) {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::hasvalidationcode");
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
setParentTenantId(parentTenantId);
}});
wxMsgValidationcode.setTenantId(tenantId);
wxMsgValidationcode.setParentTenantId(parentTenantId);
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(type);
wxMsgValidationcode.setCode(code);


+ 3
- 3
mallinkTTAdmin/src/main/java/com/iformall/controller/sys/HomeController.java Просмотреть файл

@@ -241,9 +241,9 @@ public class HomeController extends BaseController {
logger.error("appid未找到");
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);
}
TenantEntity tenantEntity = new TenantEntity() {{
setTenantId(appinfo.getTenantId());
}};
TenantEntity tenantEntity = new TenantEntity();
tenantEntity.setTenantId(appinfo.getTenantId());
if (StringUtils.isNotBlank(user.getPhone())) {
// 领导登录
user = mallUserInfoService.getByPhone(user.getPhone(), tenantEntity);


Загрузка…
Отмена
Сохранить