Commit 747d0925 by jinxin

操作日志处理

parent f133606b
...@@ -9,7 +9,6 @@ import com.gic.api.base.commons.Page; ...@@ -9,7 +9,6 @@ import com.gic.api.base.commons.Page;
import com.gic.api.base.commons.ServiceResponse; import com.gic.api.base.commons.ServiceResponse;
import com.gic.commons.util.DateUtil; import com.gic.commons.util.DateUtil;
import com.gic.commons.util.PageHelperUtils; import com.gic.commons.util.PageHelperUtils;
import com.gic.commons.util.UniqueIdUtils;
import com.gic.commons.webapi.reponse.RestResponse; import com.gic.commons.webapi.reponse.RestResponse;
import com.gic.enterprise.api.dto.EnterpriseDTO; import com.gic.enterprise.api.dto.EnterpriseDTO;
import com.gic.enterprise.api.service.EnterpriseService; import com.gic.enterprise.api.service.EnterpriseService;
...@@ -99,6 +98,7 @@ public class LicenceOrderController { ...@@ -99,6 +98,7 @@ public class LicenceOrderController {
/** /**
* 新增订单 * 新增订单
*
* @param licenceOrderQO * @param licenceOrderQO
* @return JSONObject key:orderId 和 price * @return JSONObject key:orderId 和 price
*/ */
...@@ -116,7 +116,7 @@ public class LicenceOrderController { ...@@ -116,7 +116,7 @@ public class LicenceOrderController {
licenceOrderQDTO.setCreatorId(loginUser.getClerkId()); licenceOrderQDTO.setCreatorId(loginUser.getClerkId());
licenceOrderQDTO.setCreatorName(loginUser.getClerkName()); licenceOrderQDTO.setCreatorName(loginUser.getClerkName());
ServiceResponse<String> response = licenceOrderApiService.saveOrUpdateLicenceOrder(licenceOrderQDTO); ServiceResponse<String> response = licenceOrderApiService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
if (response.isSuccess()){ if (response.isSuccess()) {
JSONObject object = JSONObject.parseObject(response.getResult(), JSONObject.class); JSONObject object = JSONObject.parseObject(response.getResult(), JSONObject.class);
String time = ""; String time = "";
if (licenceOrderQO.getTimeType() == 1) { if (licenceOrderQO.getTimeType() == 1) {
...@@ -128,7 +128,8 @@ public class LicenceOrderController { ...@@ -128,7 +128,8 @@ public class LicenceOrderController {
GicLogRecordEvaluationContext.putAttribute("logValue", logValue); GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
return RestResponse.successResult(object); return RestResponse.successResult(object);
} }
return RestResponse.failure(response.getCode(),response.getMessage()); GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure(response.getCode(), response.getMessage());
} }
/** /**
...@@ -174,14 +175,15 @@ public class LicenceOrderController { ...@@ -174,14 +175,15 @@ public class LicenceOrderController {
String clerkName = loginUser.getClerkName(); String clerkName = loginUser.getClerkName();
//取消企业微信订单 //取消企业微信订单
ServiceResponse<Boolean> response = licenceOrderApiService.cancelQywxOrder(orderId); ServiceResponse<Boolean> response = licenceOrderApiService.cancelQywxOrder(orderId);
if (response.isSuccess()){ if (response.isSuccess()) {
Boolean result = licenceOrderApiService.updateLicenceOrderType(orderId, type, enterpriseId, wxEnterpriseId, clerkName, 1).getResult(); Boolean result = licenceOrderApiService.updateLicenceOrderType(orderId, type, enterpriseId, wxEnterpriseId, clerkName, 1).getResult();
//操作日志记录 //操作日志记录
String logValue = "【取消购买企微许可账号订单】:订单编号" + dto.getOrderNumber() + ",取消时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19); String logValue = "【取消购买企微许可账号订单】:订单编号" + dto.getOrderNumber() + ",取消时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
GicLogRecordEvaluationContext.putAttribute("logValue", logValue); GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
return RestResponse.successResult(result); return RestResponse.successResult(result);
} }
return RestResponse.failure(response.getCode(),response.getMessage()); GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure(response.getCode(), response.getMessage());
} }
...@@ -205,12 +207,13 @@ public class LicenceOrderController { ...@@ -205,12 +207,13 @@ public class LicenceOrderController {
String wxEnterpriseId = loginUser.getWxEnterpriseId(); String wxEnterpriseId = loginUser.getWxEnterpriseId();
String clerkName = loginUser.getClerkName(); String clerkName = loginUser.getClerkName();
ServiceResponse<Boolean> response = licenceOrderApiService.uploadLicenceOrderVoucher(orderId, voucher, enterpriseId, wxEnterpriseId, clerkName); ServiceResponse<Boolean> response = licenceOrderApiService.uploadLicenceOrderVoucher(orderId, voucher, enterpriseId, wxEnterpriseId, clerkName);
if(response.isSuccess()){ if (response.isSuccess()) {
String logValue = "【上传购买企微许可账号支付凭证】:订单编号" + dto.getOrderNumber() + ",上传时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19); String logValue = "【上传购买企微许可账号支付凭证】:订单编号" + dto.getOrderNumber() + ",上传时间" + DateUtil.dateToStr(new Date(), DateUtil.FORMAT_DATETIME_19);
GicLogRecordEvaluationContext.putAttribute("logValue", logValue); GicLogRecordEvaluationContext.putAttribute("logValue", logValue);
return RestResponse.successResult(true); return RestResponse.successResult(true);
} }
return RestResponse.failure(response.getCode(),response.getMessage()); GicLogRecordEvaluationContext.noWriteLog();
return RestResponse.failure(response.getCode(), response.getMessage());
} }
/** /**
...@@ -235,7 +238,7 @@ public class LicenceOrderController { ...@@ -235,7 +238,7 @@ public class LicenceOrderController {
return RestResponse.successResult(map); return RestResponse.successResult(map);
} }
Integer money = result.getPrice(); Integer money = result.getPrice();
if (null != loginUser.getPhoneNumber() && Arrays.asList("13456789987", "13429152802","13383841777","13576223447").contains(loginUser.getPhoneNumber())) { if (null != loginUser.getPhoneNumber() && Arrays.asList("13456789987", "13429152802", "13383841777", "13576223447").contains(loginUser.getPhoneNumber())) {
//测试账号付款一分 //测试账号付款一分
money = 1; money = 1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment