Browse Source

Merge branch 'aliyun_real_xhxu' of https://git.youlane.cn/server/formallProject into aliyun_real_xhxu

release_toaliyun_real
xiaohanzi 5 years ago
parent
commit
f10fb12745
15 changed files with 30 additions and 8 deletions
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java
  2. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java
  3. +1
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java
  4. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java
  5. +8
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
  6. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java
  7. +3
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java
  8. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
  9. +0
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java
  10. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java
  11. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java
  12. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  13. +1
    -0
      mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java
  14. +2
    -0
      mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java
  15. +2
    -0
      mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/mem/WxScoreHistoryController.java View File

@@ -54,6 +54,7 @@ public class WxScoreHistoryController extends BaseController {
if (checkMemberStatus(wxScoreHistory.getCUserId())) {
return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
}
wxScoreHistory.updateTenantInfo(getTenantInfo());
wxScoreHistoryService.saveOrUpdate(wxScoreHistory);
return new ResultData();
}
@@ -66,6 +67,7 @@ public class WxScoreHistoryController extends BaseController {
if (checkMemberStatus(wxScoreHistory.getCUserId())) {
return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
}
wxScoreHistory.updateTenantInfo(getTenantInfo());
wxScoreHistoryService.saveOrUpdate(wxScoreHistory);
return new ResultData();
}


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java View File

@@ -43,6 +43,7 @@ public class WxMsgConfigController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxMsgConfigController::add");
//Assert.notNull(wxMsgConfig.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgConfig.updateTenantInfo(getTenantInfo());
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}
@@ -52,6 +53,7 @@ public class WxMsgConfigController extends BaseController {
@SystemControllerLog(description = "短信-配置-更新")
public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) {
logger.debug("[" + getIpAddr() + "] WxMsgConfigController::update");
wxMsgConfig.updateTenantInfo(getTenantInfo());
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}


+ 1
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgSignatureController.java View File

@@ -56,6 +56,7 @@ public class WxMsgSignatureController extends BaseController {
@SystemControllerLog(description = "消息签名-更新")
public ResultData update(@RequestBody WxMsgSignature wxMsgSignature) {
logger.debug("[" + getIpAddr() + "] WxMsgSignatureController::update");
wxMsgSignature.updateTenantInfo(getTenantInfo());
wxMsgSignatureService.saveOrUpdate(wxMsgSignature);
return new ResultData();
}


+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java View File

@@ -41,6 +41,7 @@ public class WxMsgValidationcodeController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::add");
//Assert.notNull(wxMsgValidationcode.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgValidationcode.updateTenantInfo(getTenantInfo());
wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode);
return new ResultData();
}
@@ -49,6 +50,7 @@ public class WxMsgValidationcodeController extends BaseController {
@SystemControllerLog(description = "消息验证码-更新")
public ResultData update(@RequestBody WxMsgValidationcode wxMsgValidationcode) {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::update");
wxMsgValidationcode.updateTenantInfo(getTenantInfo());
wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode);
return new ResultData();
}


+ 8
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java View File

@@ -41,6 +41,9 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
@Autowired
WxCouponPasswordMapper wxCouponPasswordMapper;

@Autowired
WxMallMapper wxMallMapper;

@Override
public PageInfo<WxMsgCallback> listAsPage(WxMsgCallback record, Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgCallbackMapper.findList(record));
@@ -74,6 +77,10 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
logger.info("短信发送回调SIGN校验成功");
WxMsgConfig wxMsgConfig = new WxMsgConfig();
wxMsgConfig.setTenantId(tenantId);
WxMall byTenantId = wxMallMapper.getByTenantId(tenantId);
if(StringUtils.isNotBlank(byTenantId.getParentTenantId())){
wxMsgConfig.setParentTenantId(byTenantId.getParentTenantId());
}
List<WxMsgConfig> list = wxMsgConfigMapper.findList(wxMsgConfig);
List<WxMsgCallback> wxMsgCallbacks = JSONArray.parseArray(param.get("item"), WxMsgCallback.class);
wxMsgConfig = list.get(0);
@@ -109,7 +116,7 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
Long callbackId = wxMsgCallback.getId();
wxMsgCallback.setId(idWorker.nextId());
wxMsgCallback.setCallbackId(callbackId);
wxMsgCallback.setTenantId(tenantId);
wxMsgCallback.updateTenantInfo(wxMsgConfig);
wxMsgCallback.setSign(param.get("sign"));
wxMsgCallback.setCreatetime(new Date());
wxMsgCallbackMapper.insert(wxMsgCallback);


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMsgModelServiceImpl.java View File

@@ -83,7 +83,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
if (wxMsgModel.getId() == null) {
final IdWorker idWorker = IdWorker.get();
wxMsgModel.setId(idWorker.nextId());
wxMsgModel.setTenantId(wxMsgModel.getTenantId());
wxMsgModel.updateTenantInfo(wxMsgModel);
if(jsonObjectResult.get("data") != null){
String data = jsonObjectResult.get("data").toString();
wxMsgModel.setModelId(Integer.valueOf(data));
@@ -110,7 +110,7 @@ public class WxMsgModelServiceImpl implements WxMsgModelService {
if (wxMsgModel.getId() == null) {
final IdWorker idWorker = IdWorker.get();
wxMsgModel.setId(idWorker.nextId());
wxMsgModel.setTenantId(wxMsgModel.getTenantId());
wxMsgModel.updateTenantInfo(wxMsgModel);
wxMsgModel.setCreatetime(new Date());
wxMsgModel.setStatus(1);
wxMsgModelMapper.insert(wxMsgModel);


+ 3
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgRecordServiceImpl.java View File

@@ -36,16 +36,19 @@ public class WxMsgRecordServiceImpl implements WxMsgRecordService {
}else if(data instanceof WxMsg){
WxMsg wxMsg = (WxMsg)data;
msgRecord.setTenantId(wxMsg.getTenantId());
msgRecord.setParentTenantId(wxMsg.getParentTenantId());
msgRecord.setMsgType(wxMsg.getMsgType());
msgRecord.setReceiver(wxMsg.getPhones());
}else if(data instanceof MailMsg){
MailMsg wxMsg = (MailMsg)data;
msgRecord.setTenantId(wxMsg.getTenantId());
msgRecord.setParentTenantId(wxMsg.getParentTenantId());
msgRecord.setMsgType(wxMsg.getMsgType());
msgRecord.setReceiver(JsonUtil.obj2Json(wxMsg.getTo()));
}else if(data instanceof SmartAppMsg){
SmartAppMsg wxMsg = (SmartAppMsg)data;
msgRecord.setTenantId(wxMsg.getTenantId());
msgRecord.setParentTenantId(wxMsg.getParentTenantId());
msgRecord.setMsgType(wxMsg.getMsgType());
msgRecord.setReceiver(wxMsg.getTo());
}


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java View File

@@ -323,6 +323,7 @@ public class WxMsgServiceImpl implements WxMsgService {
wxMsgCallback.setId(idWorker.nextId());
wxMsgCallback.setPhone(phone);
wxMsgCallback.setTenantId(wxmsg.getTenantId());
wxMsgCallback.setParentTenantId(wxmsg.getParentTenantId());
wxMsgCallback.setBatchNo(batchNo);
wxMsgCallback.setMsgId(wxmsg.getId());
wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode());


+ 0
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeModelServiceImpl.java View File

@@ -137,7 +137,6 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM
if (wxMsgModel.getId() == null) {
final IdWorker idWorker = IdWorker.get();
wxMsgModel.setId(idWorker.nextId());
wxMsgModel.setTenantId(wxMsgModel.getTenantId());
if(jsonObjectResult.get("data") != null){
String data = jsonObjectResult.get("data").toString();
wxMsgModel.setModelId(Integer.valueOf(data));
@@ -164,7 +163,6 @@ public class WxMsgValidationcodeModelServiceImpl implements WxMsgValidationcodeM
if (wxMsgModel.getId() == null) {
final IdWorker idWorker = IdWorker.get();
wxMsgModel.setId(idWorker.nextId());
wxMsgModel.setTenantId(wxMsgModel.getTenantId());
wxMsgModel.setCreatetime(new Date());
wxMsgModel.setStatus(1);
wxMsgValidationcodeModelMapper.insert(wxMsgModel);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxMsgValidationcodeServiceImpl.java View File

@@ -124,7 +124,7 @@ public class WxMsgValidationcodeServiceImpl implements WxMsgValidationcodeServic
WxMsgCallback wxMsgCallback = new WxMsgCallback();
wxMsgCallback.setId(idWorker.nextId());
wxMsgCallback.setPhone(phone);
wxMsgCallback.setTenantId(wxmsg.getTenantId());
wxMsgCallback.updateTenantInfo(wxmsg);
wxMsgCallback.setBatchNo(batchNo);
wxMsgCallback.setMsgId(wxmsg.getId());
wxMsgCallback.setStatus(EnumMsgSendStatus.MSG_SENDING.getCode());


+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderPressServiceImpl.java View File

@@ -92,7 +92,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService {
int total = coupon.getPrice() - coupon.getSalePrice();
WxOrderPress orderPress = new WxOrderPress();
orderPress.setId(idWorker.nextId());
orderPress.setTenantId(order.getTenantId());
orderPress.updateTenantInfo(order);
orderPress.setCouponId(order.getProductId());
orderPress.setOrderId(order.getId());
orderPress.setUserId(cUserId);
@@ -189,7 +189,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService {
* 检查 小程序模板消息是否超限
*/
WxMsgLimit msgLimit = new WxMsgLimit();
msgLimit.setTenantId(user.getTenantId());
msgLimit.updateTenantInfo(user);
msgLimit.setType(formType);
msgLimit.setLimitId(formId);
if(wxMsgLimitService.checkIsLimit(msgLimit)) {


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -2244,6 +2244,7 @@ public class WxOrderServiceImpl implements WxOrderService {
int left_total = total;
WxOrderPress orderPress = new WxOrderPress();
orderPress.setId(IdWorker.get().nextId());
orderPress.updateTenantInfo(user);
orderPress.setCouponId(record.getProductId());
orderPress.setOrderId(orderNumber);
orderPress.setUserId(user.getId());


+ 1
- 0
mallinkSysAdmin/src/main/java/com/iformall/controller/basic/WxMerchantController.java View File

@@ -117,6 +117,7 @@ public class WxMerchantController extends BaseController {
@SystemControllerLog(description = "商户-更新账户")
public ResultData updateMerchantAccount(@RequestBody WxMerchant wxMerchant) {
logger.debug("[" + getIpAddr() + "] WxMerchantController::updateMerchantAccount");
wxMerchant.updateTenantInfo(getTenantInfo());
return wxMerchantService.updateMerchantAccount(wxMerchant);
}



+ 2
- 0
mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgConfigController.java View File

@@ -43,6 +43,7 @@ public class WxMsgConfigController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxMsgConfigController::add");
//Assert.notNull(wxMsgConfig.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgConfig.updateTenantInfo(getTenantInfo());
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}
@@ -52,6 +53,7 @@ public class WxMsgConfigController extends BaseController {
@SystemControllerLog(description = "短信-配置-更新")
public ResultData update(@RequestBody WxMsgConfig wxMsgConfig) {
logger.debug("[" + getIpAddr() + "] WxMsgConfigController::update");
wxMsgConfig.updateTenantInfo(getTenantInfo());
wxMsgConfigService.saveOrUpdate(wxMsgConfig);
return new ResultData();
}


+ 2
- 0
mallinkSysAdmin/src/main/java/com/iformall/controller/msg/WxMsgValidationcodeController.java View File

@@ -40,6 +40,7 @@ public class WxMsgValidationcodeController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::add");
//Assert.notNull(wxMsgValidationcode.getName(), "角色名不能为空");
//Assert.isTrue(!checkUnique(sysRole.getName(), null), "重复的角色名");
wxMsgValidationcode.updateTenantInfo(getTenantInfo());
wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode);
return new ResultData();
}
@@ -48,6 +49,7 @@ public class WxMsgValidationcodeController extends BaseController {
@SystemControllerLog(description = "消息验证码-更新")
public ResultData update(@RequestBody WxMsgValidationcode wxMsgValidationcode) {
logger.debug("[" + getIpAddr() + "] WxMsgValidationcodeController::update");
wxMsgValidationcode.updateTenantInfo(getTenantInfo());
wxMsgValidationcodeService.saveOrUpdate(wxMsgValidationcode);
return new ResultData();
}


Loading…
Cancel
Save