Commit c905c39e by jinxin

企业微信接口开发

parent 24ff5b27
...@@ -39,7 +39,7 @@ public interface LicenceOrderApiService { ...@@ -39,7 +39,7 @@ public interface LicenceOrderApiService {
* @param licenceOrderQDTO * @param licenceOrderQDTO
* @return * @return
*/ */
ServiceResponse<Boolean> saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO); ServiceResponse<String> saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO);
/** /**
* 分页查询订单数据 * 分页查询订单数据
......
...@@ -36,9 +36,9 @@ public interface LicenceOrderService { ...@@ -36,9 +36,9 @@ public interface LicenceOrderService {
/** /**
* 新增或者修改订单 * 新增或者修改订单
* @param licenceOrderQDTO * @param licenceOrderQDTO
* @return * @return orderId
*/ */
void saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO); String saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO);
/** /**
* 更新订单状态 * 更新订单状态
......
...@@ -59,12 +59,12 @@ public class LicenceOrderServiceImpl implements LicenceOrderService { ...@@ -59,12 +59,12 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
@Override @Override
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public void saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO) { public String saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO) {
long orderId = UniqueIdUtils.uniqueLong();
if(ObjectUtil.isNull(licenceOrderQDTO.getOrderId())){ if(ObjectUtil.isNull(licenceOrderQDTO.getOrderId())){
//订单不支持修改,只能新增 //订单不支持修改,只能新增
TabHaobanLicenceOrder order = JSONObject.parseObject(JSONObject.toJSONString(licenceOrderQDTO), TabHaobanLicenceOrder.class); TabHaobanLicenceOrder order = JSONObject.parseObject(JSONObject.toJSONString(licenceOrderQDTO), TabHaobanLicenceOrder.class);
Date now = new Date(); Date now = new Date();
long orderId = UniqueIdUtils.uniqueLong();
order.setOrderId(orderId); order.setOrderId(orderId);
order.setCreateTime(now); order.setCreateTime(now);
order.setUpdateTime(now); order.setUpdateTime(now);
...@@ -82,6 +82,7 @@ public class LicenceOrderServiceImpl implements LicenceOrderService { ...@@ -82,6 +82,7 @@ public class LicenceOrderServiceImpl implements LicenceOrderService {
//记录订单进度 //记录订单进度
saveOrderProgress(orderId,"创建订单",licenceOrderQDTO.getEnterpriseId(),licenceOrderQDTO.getWxEnterpriseId(),licenceOrderQDTO.getCreatorName()); saveOrderProgress(orderId,"创建订单",licenceOrderQDTO.getEnterpriseId(),licenceOrderQDTO.getWxEnterpriseId(),licenceOrderQDTO.getCreatorName());
} }
return String.valueOf(orderId);
} }
private void saveOrderProgress(Long orderId,String orderStatus,String enterpriseId,String wxEnterpriseId,String creatorName){ private void saveOrderProgress(Long orderId,String orderStatus,String enterpriseId,String wxEnterpriseId,String creatorName){
......
...@@ -80,9 +80,9 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService { ...@@ -80,9 +80,9 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
} }
@Override @Override
public ServiceResponse<Boolean> saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO) { public ServiceResponse<String> saveOrUpdateLicenceOrder(LicenceOrderQDTO licenceOrderQDTO) {
licenceOrderService.saveOrUpdateLicenceOrder(licenceOrderQDTO); String s = licenceOrderService.saveOrUpdateLicenceOrder(licenceOrderQDTO);
return ServiceResponse.success(true); return ServiceResponse.success(s);
} }
@Override @Override
......
...@@ -83,7 +83,7 @@ public class LicenceOrderController { ...@@ -83,7 +83,7 @@ public class LicenceOrderController {
* 新增或者修改订单 * 新增或者修改订单
*/ */
@RequestMapping("licence-order-saveOrUpdate") @RequestMapping("licence-order-saveOrUpdate")
public RestResponse<Boolean> saveOrUpdateLicenceOrder(@RequestBody LicenceOrderQO licenceOrderQO) { public RestResponse<String> saveOrUpdateLicenceOrder(@RequestBody LicenceOrderQO licenceOrderQO) {
WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser(); WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())){ if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())){
return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()),HaoBanErrCode.ERR_4.getMsg()); return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()),HaoBanErrCode.ERR_4.getMsg());
...@@ -100,7 +100,7 @@ public class LicenceOrderController { ...@@ -100,7 +100,7 @@ public class LicenceOrderController {
licenceOrderQDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId()); licenceOrderQDTO.setWxEnterpriseId(loginUser.getWxEnterpriseId());
licenceOrderQDTO.setCreatorId(loginUser.getClerkId()); licenceOrderQDTO.setCreatorId(loginUser.getClerkId());
licenceOrderQDTO.setCreatorName(loginUser.getClerkName()); licenceOrderQDTO.setCreatorName(loginUser.getClerkName());
Boolean result = licenceOrderApiService.saveOrUpdateLicenceOrder(licenceOrderQDTO).getResult(); String result = licenceOrderApiService.saveOrUpdateLicenceOrder(licenceOrderQDTO).getResult();
return RestResponse.successResult(result); return RestResponse.successResult(result);
} }
/** /**
......
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