lin 3 лет назад
Родитель
Сommit
3786209be1
5 измененных файлов: 22 добавлений и 4 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/base/BaseController.java
  2. +6
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  3. +1
    -3
      mallinkCApi/src/main/java/com/iformall/controller/WxCarController.java
  4. +8
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
  5. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxRentContractServiceImpl.java

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

@@ -49,7 +49,7 @@ public class BaseController {
MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo); MallUserInfo user = (MallUserInfo) SecurityUtils.getSubject().getSession().getAttribute(UserSession.userInfo);
// MallUserInfo user = new MallUserInfo(); // MallUserInfo user = new MallUserInfo();
// user.setId(321127266275430400L); // user.setId(321127266275430400L);
// user.setName("富茂光谷测试版管理员");
// user.setName("alitest");
// user.setTenantId("789"); // user.setTenantId("789");
// user.setParentTenantId(null); // user.setParentTenantId(null);
return user; return user;


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

@@ -275,6 +275,12 @@ public class WxMerchantController extends BaseController {
wxMerchant.updateTenantInfo(getTenantInfo()); wxMerchant.updateTenantInfo(getTenantInfo());
return wxMerchantService.updateMerchantLevel(wxMerchant); return wxMerchantService.updateMerchantLevel(wxMerchant);
} }
@ApiOperation("商户手填收款账号")
@PostMapping("setMerchantAccount")
public ResultData setMerchantAccount(@RequestBody WxMerchant wxMerchant) {
return null;
}


@ApiOperation("查询当前租户下商户名称列表") @ApiOperation("查询当前租户下商户名称列表")
@GetMapping("/name_list") @GetMapping("/name_list")


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

@@ -376,8 +376,6 @@ public class WxCarController extends BaseController {
Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, vendor.getMessage(), carNumber); Integer used = ParkCacheUtils.getCarCouponUseCacheLock(redisTemplate, vendor.getMessage(), carNumber);


if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) {
if (null == used || (null != used && used.intValue() < 1)) { if (null == used || (null != used && used.intValue() < 1)) {
ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber); ResultData result = etcpHelper.getCoupon(paramMap, park, userCar,carNumber);
@@ -506,7 +504,7 @@ public class WxCarController extends BaseController {
"127.0.0.1", park.getPaidCallBack(), payAccount.getApiKey(), new Date()); "127.0.0.1", park.getPaidCallBack(), payAccount.getApiKey(), new Date());
return new ResultData(wxResult); return new ResultData(wxResult);
} catch (Exception e) { } catch (Exception e) {
logger.error("park getCarStopFee error",e);
logger.error("park createPayOrder error",e);
return new ResultData(Result.ERROR,e.getMessage()); return new ResultData(Result.ERROR,e.getMessage());
} }
} }


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

@@ -401,6 +401,14 @@ public class WxMerchant extends TenantEntity {
@TableField(exist = false) @TableField(exist = false)
private BigDecimal latitude; private BigDecimal latitude;
@io.swagger.annotations.ApiModelProperty(value="首款账号",name="account")
@TableField(exist = false)
private String account;
@io.swagger.annotations.ApiModelProperty(value="收款账号",name="apiKey")
@TableField(exist = false)
private String apiKey;
//查询停车商户根据此字段 //查询停车商户根据此字段
@TableField(exist = false) @TableField(exist = false)
private Integer hasCarVendor; private Integer hasCarVendor;


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

@@ -850,6 +850,12 @@ public class WxRentContractServiceImpl implements WxRentContractService {
record.setStatus(wxRentContract.getStatus()); record.setStatus(wxRentContract.getStatus());
} }
record.setApplyStatus(wxRentContract.getApplyStatus()); record.setApplyStatus(wxRentContract.getApplyStatus());
if (StringUtils.isBlank(record.getOperatingManagementFee())){
record.setOperatingManagementFee(null);
}
if (StringUtils.isBlank(record.getBussinessManagementFee())){
record.setBussinessManagementFee(null);
}
wxRentContractMapper.updateById(record); wxRentContractMapper.updateById(record);
record.setRentalStartDate(tempDate); record.setRentalStartDate(tempDate);
} catch (Exception e) { } catch (Exception e) {


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