Bläddra i källkod

[集团版][修改]:集团版预处理

release_toaliyun_real
Stormeye Wu 6 år sedan
förälder
incheckning
2d39d395b1
7 ändrade filer med 55 tillägg och 50 borttagningar
  1. +2
    -2
      mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java
  2. +2
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java
  3. +4
    -4
      mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java
  4. +2
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java
  5. +7
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java
  6. +3
    -2
      mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java
  7. +35
    -34
      mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java

+ 2
- 2
mallinkCApi/src/main/java/com/iformall/controller/WxMsgValidationcodeController.java Visa fil

@@ -46,7 +46,7 @@ public class WxMsgValidationcodeController extends BaseController {
public ResultData sendvalidationcode(String phone, Integer type) {
WxCUser user = getUser();
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.setTenantId(user.getTenantId());
wxMsgValidationcode.updateTenantInfo(getTenantInfo());
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(type);
wxMsgValidationcode.setAppid(user.getAppId());
@@ -61,7 +61,7 @@ public class WxMsgValidationcodeController extends BaseController {
public ResultData hasvalidationcode(String phone, Integer type, String code) {
WxCUser user = getUser();
WxMsgValidationcode wxMsgValidationcode = new WxMsgValidationcode();
wxMsgValidationcode.setTenantId(user.getTenantId());
wxMsgValidationcode.updateTenantInfo(getTenantInfo());
wxMsgValidationcode.setPhone(phone);
wxMsgValidationcode.setType(type);
wxMsgValidationcode.setCode(code);


+ 2
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxTopicController.java Visa fil

@@ -22,16 +22,14 @@ public class WxTopicController extends BaseController {
public ResultData show() {
logger.debug("[" + getIpAddr() + "] WxTopicController::show");
WxTopic wxTopic = new WxTopic();
String tenantId = getTenantId();
wxTopic.setTenantId(tenantId);
wxTopic.updateTenantInfo(getTenantInfo());
return new ResultData(wxTopicService.show(wxTopic));
}

@GetMapping("findById")
public ResultData findById(WxTopic wxTopic) {
logger.debug("[" + getIpAddr() + "] WxTopicController::findById");
String tenantId = getTenantId();
wxTopic.setTenantId(tenantId);
wxTopic.updateTenantInfo(getTenantInfo());
WxTopic queryTopic = wxTopicService.findById(wxTopic);
return new ResultData(queryTopic);
}


+ 4
- 4
mallinkCApi/src/main/java/com/iformall/controller/WxUserGrantController.java Visa fil

@@ -213,7 +213,7 @@ public class WxUserGrantController extends BaseController {
String ipaddress = IPUtil.getIpAddr(request);

WxCUser newUser = new WxCUser();
newUser.setTenantId(wxAuthorizerInfo.getTenantId());
newUser.updateTenantInfo(wxAuthorizerInfo);
newUser.setAppId(appId);
newUser.setOpenId(openId);
if (boolHaveUnionId) {
@@ -224,7 +224,7 @@ public class WxUserGrantController extends BaseController {
if (boolHaveUnionId) {
// 优先根据unionId查询
WxCUser userQ = new WxCUser();
userQ.setTenantId(wxAuthorizerInfo.getTenantId());
userQ.updateTenantInfo(wxAuthorizerInfo);
userQ.setUnionId(unionId);
oldUser = wxCUserService.getByObject(userQ);
if(oldUser != null) {
@@ -281,7 +281,7 @@ public class WxUserGrantController extends BaseController {
resultMap.put("score", score);
} else {
// 新用户
newUser.setTenantId(wxAuthorizerInfo.getTenantId());
newUser.updateTenantInfo(wxAuthorizerInfo);
token = newUser.createToken(new Date());

newUser.setRegisterIp(ipaddress);
@@ -679,7 +679,7 @@ public class WxUserGrantController extends BaseController {
public ResultData carCount() {
WxCUser user = getUser();
WxCUserCar userCar = new WxCUserCar();
userCar.setTenantId(user.getTenantId());
userCar.updateTenantInfo(getTenantInfo());
userCar.setCUserId(user.getId());
Integer count = wxCUserCarService.countUserCar(userCar);
if (count > 0) {


+ 2
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/ActivitySchedule.java Visa fil

@@ -56,7 +56,7 @@ public class ActivitySchedule {
WxActivityJoin wxActivityJoin;
for (WxActivity activity : wxActivitys) {
wxActivityJoin = new WxActivityJoin();
wxActivityJoin.setTenantId(activity.getTenantId());
wxActivityJoin.updateTenantInfo(activity);
wxActivityJoin.setActivityId(activity.getId());
wxActivityJoin.setStatus(EnumActivityJoinStatus.CONFIRMED.getCode());
List<WxActivityJoin> list = wxActivityJoinMapper.findList(wxActivityJoin);
@@ -77,7 +77,7 @@ public class ActivitySchedule {
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setModelType(EnumMsgModel.TIME_LIMIT_CAMPAIGN_NOTIFY.getCode());
wxMsgRecord.setReceiver(phone);
wxMsgRecord.setTenantId(activityJoin.getTenantId());
wxMsgRecord.updateTenantInfo(activityJoin);
Map<String, String> map = new HashedMap();
map.put("person", person);
map.put("party", party);


+ 7
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java Visa fil

@@ -1,6 +1,7 @@
package com.iformall.schedule;

import com.alibaba.fastjson.JSONObject;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.po.msg.WxMsgRecord;
import com.iformall.enums.*;
import com.iformall.mapper.WxBillAllMapper;
@@ -66,7 +67,9 @@ public class BillNotificationSchedule {
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setModelType(EnumMsgModel.BILL_OWE.getCode());
wxMsgRecord.setReceiver(phone);
wxMsgRecord.setTenantId(tenantId);
wxMsgRecord.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
}});
Map<String, String> map = new HashedMap();
map.put("price", price.toString());
map.put("app", appname);
@@ -95,7 +98,9 @@ public class BillNotificationSchedule {
wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode());
wxMsgRecord.setModelType(EnumMsgModel.BILL_WAIT_PAY.getCode());
wxMsgRecord.setReceiver(phone);
wxMsgRecord.setTenantId(tenantId);
wxMsgRecord.updateTenantInfo(new TenantEntity(){{
setTenantId(tenantId);
}});
Map<String, String> map = new HashedMap();
map.put("price", price.toString());
map.put("app", appname);


+ 3
- 2
mallinkSchedule/src/main/java/com/iformall/schedule/BillStatusSchedule.java Visa fil

@@ -1,6 +1,7 @@
package com.iformall.schedule;

import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxBillAll;
import com.iformall.mapper.WxMallMapper;
import com.iformall.service.WxBillAllService;
@@ -35,9 +36,9 @@ public class BillStatusSchedule {

List<WxMall> wxMalls = wxMallMapper.findList(null);
for (WxMall wxMall : wxMalls) {
String tenantId = wxMall.getTenantId();
TenantEntity tenantEntity = wxMall.getTenantInfo();
WxBillAll wxBillAll = new WxBillAll();
wxBillAll.setTenantId(tenantId);
wxBillAll.updateTenantInfo(tenantEntity);
wxBillAllService.updateBillStatus(wxBillAll);
}



+ 35
- 34
mallinkSchedule/src/main/java/com/iformall/schedule/ChartDataSchedule.java Visa fil

@@ -7,6 +7,7 @@ import com.iformall.domain.po.WxChartDataEntity;
import com.iformall.domain.po.WxCouponOrder;
import com.iformall.domain.po.WxMall;
import com.iformall.domain.po.WxMerchantTradeDaily;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.enums.EnumCarCmd;
import com.iformall.enums.EnumChartType;
import com.iformall.mapper.*;
@@ -77,45 +78,45 @@ public class ChartDataSchedule {

List<WxMall> wxMalls = wxMallMapper.findList(null);
for (WxMall wxMall : wxMalls) {
String tenantId = wxMall.getTenantId();
params.put("tenantId", tenantId);
wxChartDataEntity.setTenantId(tenantId);
TenantEntity tenantEntity = wxMall.getTenantInfo();
params.put("tenantId", tenantEntity.getTenantId());
wxChartDataEntity.updateTenantInfo(tenantEntity);
wxChartDataEntity.setType(EnumChartType.CAR_OUT.getCode());
int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
logger.info("出场车数>>>>>>>>>>>>>>>>>>>>>>>>>>");
carOutData(params, createtime, date, tenantId);
carOutData(params, createtime, date, tenantEntity);
}
wxChartDataEntity.setType(EnumChartType.CAR_PAID.getCode());
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
params.put("cmdType", EnumCarCmd.CAR_ETCP_CALLBACK_PAY_MANUAL.getCode());
logger.info("缴费车辆>>>>>>>>>>>>>>>>>>>>>>>>>>");
carPaidData(params, createtime, date, tenantId);
carPaidData(params, createtime, date, tenantEntity);
}
wxChartDataEntity.setType(EnumChartType.CAR_PAY_FEE.getCode());
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
logger.info("缴费金额>>>>>>>>>>>>>>>>>>>>>>>>>>");
carPayFeeData(params, createtime, date, tenantId);
carPayFeeData(params, createtime, date, tenantEntity);
}
wxChartDataEntity.setType(EnumChartType.CAR_MEMBER.getCode());
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
logger.info("新增会员>>>>>>>>>>>>>>>>>>>>>>>>>>");
carMemberData(params, createtime, date, tenantId);
carMemberData(params, createtime, date, tenantEntity);
}
wxChartDataEntity.setType(EnumChartType.CAR_NEW_MEMBER.getCode());
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
logger.info("新增停车会员>>>>>>>>>>>>>>>>>>>>>>>>>>");
carNewMemberData(createtime, date, tenantId);
carNewMemberData(createtime, date, tenantEntity);
}
wxChartDataEntity.setType(EnumChartType.CAR_BIND.getCode());
count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
logger.info("已绑车辆>>>>>>>>>>>>>>>>>>>>>>>>>>");
carBindData(params, createtime, date, tenantId);
carBindData(params, createtime, date, tenantEntity);
}
}
}
@@ -136,19 +137,19 @@ public class ChartDataSchedule {

List<WxMall> wxMalls = wxMallMapper.findList(null);
for (WxMall wxMall : wxMalls) {
String tenantId = wxMall.getTenantId();
params.put("tenantId", tenantId);
wxChartDataEntity.setTenantId(tenantId);
TenantEntity tenantEntity = wxMall.getTenantInfo();
params.put("tenantId", tenantEntity.getTenantId());
wxChartDataEntity.updateTenantInfo(tenantEntity);
wxChartDataEntity.setType(EnumChartType.SALE_COUPON_PRICE.getCode());
int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
logger.info("销售总交易额>>>>>>>>>>>>>>>>>>>>>>>>>>");
WxCouponOrder wxCouponOrder = new WxCouponOrder();
wxCouponOrder.setTenantId(tenantId);
wxCouponOrder.updateTenantInfo(tenantEntity);
wxCouponOrder.setStartTime(startdate);
wxCouponOrder.setEndTime(enddate);
Integer price = wxCouponOrderMapper.queryPriceTotal(wxCouponOrder);
addChartData(tenantId, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime);
addChartData(tenantEntity, price.toString(), EnumChartType.SALE_COUPON_PRICE.getCode(), startdate, createtime);
}
}
}
@@ -167,72 +168,72 @@ public class ChartDataSchedule {

List<WxMall> wxMalls = wxMallMapper.findList(null);
for (WxMall wxMall : wxMalls) {
String tenantId = wxMall.getTenantId();
params.put("tenantId", tenantId);
TenantEntity tenantEntity = wxMall.getTenantInfo();
params.put("tenantId", tenantEntity.getTenantId());

wxChartDataEntity.setTenantId(tenantId);
wxChartDataEntity.updateTenantInfo(tenantEntity);
wxChartDataEntity.setType(EnumChartType.MERCHANT_TRADE.getCode());
int count = wxChartDataMapper.selectCount(new QueryWrapper(wxChartDataEntity));
if (count == 0) {
logger.info("解单金额>>>>>>>>>>>>>>>>>>>>>>>>>>");
WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
wxMerchantTradeDaily.setTenantId(tenantId);
wxMerchantTradeDaily.updateTenantInfo(tenantEntity);
wxMerchantTradeDaily.setReportDate(yesterday);
List<WxMerchantTradeDaily> recordList = wxMerchantTradeDailyMapper.findTotalListOfMonth(wxMerchantTradeDaily);
Integer price = 0;
if (!recordList.isEmpty()) {
price = Integer.parseInt(recordList.get(0).getTradeAmt());
}
addChartData(tenantId, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime);
addChartData(tenantEntity, price.toString(), EnumChartType.MERCHANT_TRADE.getCode(), querytime, createtime);
}
}
}


public void carBindData(HashMap<String, Object> params, Date createtime, Date date, String tenantId) {
public void carBindData(HashMap<String, Object> params, Date createtime, Date date, TenantEntity tenantEntity) {
Long todaybindcar = wxCUserCarMapper.queryCarCount(params);
addChartData(tenantId, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime);
addChartData(tenantEntity, todaybindcar.toString(), EnumChartType.CAR_BIND.getCode(), date, createtime);
}

public void carNewMemberData(Date createtime, Date date, String tenantId) {
public void carNewMemberData(Date createtime, Date date, TenantEntity tenantEntity) {
WxCUserBasicInfoDto wxCUserBasicInfoDto = new WxCUserBasicInfoDto();
wxCUserBasicInfoDto.setTenantId(tenantId);
wxCUserBasicInfoDto.updateTenantInfo(tenantEntity);
wxCUserBasicInfoDto.setStartTime(date);
wxCUserBasicInfoDto.setEndTime(date);
Integer carUserCount = wxCUserCarMapper.countUser(wxCUserBasicInfoDto);
addChartData(tenantId, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime);
addChartData(tenantEntity, carUserCount.toString(), EnumChartType.CAR_NEW_MEMBER.getCode(), date, createtime);
}

public void carMemberData(HashMap<String, Object> params, Date createtime, Date date, String tenantId) {
public void carMemberData(HashMap<String, Object> params, Date createtime, Date date, TenantEntity tenantEntity) {
List<Map<String, Object>> carCountHistory = wxCUserCarMapper.queryCarCountHistory(params);
Long userCount = carCountHistory.isEmpty() ? 0L : (Long) carCountHistory.get(0).get("count");
addChartData(tenantId, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime);
addChartData(tenantEntity, userCount.toString(), EnumChartType.CAR_MEMBER.getCode(), date, createtime);
}

public void carPayFeeData(HashMap<String, Object> params, Date createtime, Date date, String tenantId) {
public void carPayFeeData(HashMap<String, Object> params, Date createtime, Date date, TenantEntity tenantEntity) {
List<Map<String, Object>> weekCarPayHistoryList = wxCarCmdLogMapper.queryWeekCarPay(params);
BigDecimal fee = weekCarPayHistoryList.isEmpty() ? new BigDecimal(0) : (BigDecimal) weekCarPayHistoryList.get(0).get("fee");
addChartData(tenantId, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime);
addChartData(tenantEntity, fee.toString(), EnumChartType.CAR_PAY_FEE.getCode(), date, createtime);
}

public void carPaidData(HashMap<String, Object> params, Date createtime, Date date, String tenantId) {
public void carPaidData(HashMap<String, Object> params, Date createtime, Date date, TenantEntity tenantEntity) {
Long carPayFeeCount = wxCarCmdLogMapper.queryWeekCarPayCount(params);
addChartData(tenantId, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime);
addChartData(tenantEntity, carPayFeeCount.toString(), EnumChartType.CAR_PAID.getCode(), date, createtime);
}

public void carOutData(HashMap<String, Object> params, Date createtime, Date date, String tenantId) {
public void carOutData(HashMap<String, Object> params, Date createtime, Date date, TenantEntity tenantEntity) {
List<Map<String, Object>> historylist = wxCarCmdLogMapper.queryHistory(params);
Long carOutCount = historylist.isEmpty() ? 0L : (Long) historylist.get(0).get("carcount");
addChartData(tenantId, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime);
addChartData(tenantEntity, carOutCount.toString(), EnumChartType.CAR_OUT.getCode(), date, createtime);
}

private void addChartData(String tenantId, String result, Integer type, Date querytime, Date createtime) {
private void addChartData(TenantEntity tenantEntity, String result, Integer type, Date querytime, Date createtime) {
logger.info("即将插入数据>>>>>>>>>>>>>>>>>>>>>>>");
final IdWorker idWorker = IdWorker.get();
long id = idWorker.nextId();
WxChartDataEntity wxChartDataEntity = new WxChartDataEntity();
wxChartDataEntity.setId(id);
wxChartDataEntity.setTenantId(tenantId);
wxChartDataEntity.updateTenantInfo(tenantEntity);
wxChartDataEntity.setResult(result);
wxChartDataEntity.setType(type);
wxChartDataEntity.setQuerytime(querytime);


Laddar…
Avbryt
Spara