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

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

release_toaliyun_real
Stormeye Wu 6 лет назад
Родитель
Сommit
2746236fb8
3 измененных файлов: 16 добавлений и 15 удалений
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/BaseController.java
  2. +14
    -13
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  3. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -163,7 +163,7 @@ public class BaseController {
Date cur = new Date(); Date cur = new Date();
WxCUserBasicInfo basicInfo = new WxCUserBasicInfo(); WxCUserBasicInfo basicInfo = new WxCUserBasicInfo();
basicInfo.setId(user.getId()); basicInfo.setId(user.getId());
basicInfo.setTenantId(user.getTenantId());
basicInfo.updateTenantInfo(user);
basicInfo.setPhone(phone); basicInfo.setPhone(phone);
basicInfo.setNickName(user.getNickName()); basicInfo.setNickName(user.getNickName());
basicInfo.setSex(user.getGender()); basicInfo.setSex(user.getGender());


+ 14
- 13
mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java Просмотреть файл

@@ -8,6 +8,7 @@ import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.*; import com.iformall.domain.po.*;
import com.iformall.domain.po.base.BaseEntity; import com.iformall.domain.po.base.BaseEntity;
import com.iformall.domain.po.base.TenantEntity;
import com.iformall.domain.vo.WxCouponOrderCarCVo; import com.iformall.domain.vo.WxCouponOrderCarCVo;
import com.iformall.domain.vo.WxMerchantVo; import com.iformall.domain.vo.WxMerchantVo;
import com.iformall.enums.*; import com.iformall.enums.*;
@@ -69,9 +70,9 @@ public class WxCarController extends BaseController {
@Autowired @Autowired
WxCreditHistoryService wxCreditHistoryService; WxCreditHistoryService wxCreditHistoryService;


private WxPark getCurrentPark(String tenantId) {
private WxPark getCurrentPark(TenantEntity tenantEntity) {
WxPark parkQ = new WxPark(); WxPark parkQ = new WxPark();
parkQ.setTenantId(tenantId);
parkQ.updateTenantInfo(tenantEntity);
WxPark wxPark = wxParkService.getByObj(parkQ); WxPark wxPark = wxParkService.getByObj(parkQ);
// 1, get mall's park // 1, get mall's park
// future use redis to optimize // future use redis to optimize
@@ -82,7 +83,7 @@ public class WxCarController extends BaseController {
@GetMapping("/getVendor") @GetMapping("/getVendor")
public ResultData getVendor() { public ResultData getVendor() {
// 1, get mall's park // 1, get mall's park
WxPark park = getCurrentPark(getTenantId());
WxPark park = getCurrentPark(getTenantInfo());
Map map = new HashMap(); Map map = new HashMap();
map.put("vendor", park.getVendorType()); map.put("vendor", park.getVendorType());
return new ResultData(map); return new ResultData(map);
@@ -99,7 +100,7 @@ public class WxCarController extends BaseController {
public ResultData init(@RequestBody Map<String, String> paramMap) { public ResultData init(@RequestBody Map<String, String> paramMap) {
WxCUser user = getUser(); WxCUser user = getUser();
// 1, get mall's park // 1, get mall's park
WxPark park = getCurrentPark(getTenantId());
WxPark park = getCurrentPark(getTenantInfo());
// 2. get vendor params // 2. get vendor params
if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) {
return initForEtcp(paramMap, user, park); return initForEtcp(paramMap, user, park);
@@ -150,7 +151,7 @@ public class WxCarController extends BaseController {
dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode()); dataObj.put("vendor", EnumCarVendor.CAR_ETCP.getCode());
String etcpToken = dataObj.getString("token"); String etcpToken = dataObj.getString("token");
try { try {
JSONObject dataObj1 = etcpSyncCarNumbers(user.getId(), user.getTenantId(), park.getVendorType(),
JSONObject dataObj1 = etcpSyncCarNumbers(park, user.getId(), park.getVendorType(),
url, merchantNo, merchantKey, version, url, merchantNo, merchantKey, version,
etcpToken); etcpToken);
} catch (MallinkException e) { } catch (MallinkException e) {
@@ -167,8 +168,8 @@ public class WxCarController extends BaseController {
/** /**
* ETCP同步 * ETCP同步
* *
* @param tenantEntity
* @param cUserId * @param cUserId
* @param tenantId
* @param iVendorType * @param iVendorType
* @param url * @param url
* @param merchantNo * @param merchantNo
@@ -177,7 +178,7 @@ public class WxCarController extends BaseController {
* @param etcpToken * @param etcpToken
* @return * @return
*/ */
private JSONObject etcpSyncCarNumbers(Long cUserId, String tenantId, int iVendorType,
private JSONObject etcpSyncCarNumbers(TenantEntity tenantEntity, Long cUserId, int iVendorType,
String url, String merchantNo, String merchantKey, String version, String url, String merchantNo, String merchantKey, String version,
String etcpToken) { String etcpToken) {
String ret; String ret;
@@ -212,7 +213,7 @@ public class WxCarController extends BaseController {
Date curr = new Date(); Date curr = new Date();
WxCUserCar userCar = new WxCUserCar(); WxCUserCar userCar = new WxCUserCar();
userCar.setCUserId(cUserId); userCar.setCUserId(cUserId);
userCar.setTenantId(tenantId);
userCar.updateTenantInfo(tenantEntity);
userCar.setCarNumber(_carNum); userCar.setCarNumber(_carNum);
userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode());
userCar.setCreateDate(curr); userCar.setCreateDate(curr);
@@ -258,7 +259,7 @@ public class WxCarController extends BaseController {
@PostMapping("/bindCar") @PostMapping("/bindCar")
public ResultData bindCar(@RequestBody Map<String, String> paramMap) { public ResultData bindCar(@RequestBody Map<String, String> paramMap) {
// 1, get mall's park // 1, get mall's park
WxPark park = getCurrentPark(getTenantId());
WxPark park = getCurrentPark(getTenantInfo());
// 2. get vendor params // 2. get vendor params
if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) {
return etcpBindCar(paramMap, park); return etcpBindCar(paramMap, park);
@@ -433,7 +434,7 @@ public class WxCarController extends BaseController {
@PostMapping("/unbindCar") @PostMapping("/unbindCar")
public ResultData unbindCar(@RequestBody Map<String, String> paramMap) { public ResultData unbindCar(@RequestBody Map<String, String> paramMap) {
// 1, get mall's park // 1, get mall's park
WxPark park = getCurrentPark(getTenantId());
WxPark park = getCurrentPark(getTenantInfo());
if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) {
return etcpUnbindCar(paramMap, park); return etcpUnbindCar(paramMap, park);
} else { } else {
@@ -590,7 +591,7 @@ public class WxCarController extends BaseController {
@PostMapping("/getCarStopFee") @PostMapping("/getCarStopFee")
public ResultData getCarStopFee(@RequestBody Map<String, String> paramMap) { public ResultData getCarStopFee(@RequestBody Map<String, String> paramMap) {
// 1, get mall's park // 1, get mall's park
WxPark park = getCurrentPark(getTenantId());
WxPark park = getCurrentPark(getTenantInfo());
if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) {
return etcpCarStopFee(paramMap, park); return etcpCarStopFee(paramMap, park);
} else if (park.getVendorType().equals(EnumCarVendor.CAR_TJD.getCode())) { } else if (park.getVendorType().equals(EnumCarVendor.CAR_TJD.getCode())) {
@@ -707,7 +708,7 @@ public class WxCarController extends BaseController {
@PostMapping("/getCoupon") @PostMapping("/getCoupon")
public ResultData getCoupon(@RequestBody Map<String, String> paramMap) { public ResultData getCoupon(@RequestBody Map<String, String> paramMap) {
/// 1, get mall's park /// 1, get mall's park
WxPark park = getCurrentPark(getTenantId());
WxPark park = getCurrentPark(getTenantInfo());
String carNumber = paramMap.get("carNumber"); String carNumber = paramMap.get("carNumber");
String couponOrderIdStr = paramMap.get("couponOrderId"); String couponOrderIdStr = paramMap.get("couponOrderId");
if (StringUtils.isBlank(carNumber)) { if (StringUtils.isBlank(carNumber)) {
@@ -886,7 +887,7 @@ public class WxCarController extends BaseController {
@GetMapping("/getParkStatus") @GetMapping("/getParkStatus")
public ResultData getParkStatus() { public ResultData getParkStatus() {
/// 1, get mall's park /// 1, get mall's park
WxPark park = getCurrentPark(getTenantId());
WxPark park = getCurrentPark(getTenantInfo());
if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) {
ResultData e = etcpParkStatus(park); ResultData e = etcpParkStatus(park);
if (e != null) return e; if (e != null) return e;


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCardPayController.java Просмотреть файл

@@ -143,7 +143,7 @@ public class WxCardPayController extends BaseController {
} }


WxCardSpend record = new WxCardSpend(); WxCardSpend record = new WxCardSpend();
record.setTenantId(merchant.getTenantId());
record.updateTenantInfo(merchant);
record.setCardId(cardId); record.setCardId(cardId);
record.setOwnerId(getUserId()); record.setOwnerId(getUserId());
record.setMerchantId(merchantId); record.setMerchantId(merchantId);


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