Merge branch 'dev_thirdplatform' into dev

epmet-module/epmet-third/epmet-third-server/src/main/java/com/epmet/service/impl/CodeServiceImpl.java

@@ -133,21 +133,21 @@ public class CodeServiceImpl implements CodeService {
 		codeExtDTO.setExtJson(extJson);
 		codeExtService.update(codeExtDTO);
 
-//		WxMaCodeCommitReq request = ConvertUtils.sourceToTarget(formDTO, WxMaCodeCommitReq.class);
-//		request.setExtJson(extJson);
-//		//调用微信API上传代码
-//		WxResult wxResult = wxMaCodeService.commit(authInfo.getAuthorizerAccessToken(), request);
-//		//上传失败，抛出异常
-//		if (!wxResult.success()) {
-//			saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg());
-//			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
-//		}
+		WxMaCodeCommitReq request = ConvertUtils.sourceToTarget(formDTO, WxMaCodeCommitReq.class);
+		request.setExtJson(extJson);
+		//调用微信API上传代码
+		WxResult wxResult = wxMaCodeService.commit(authInfo.getAuthorizerAccessToken(), request);
+		//上传失败，抛出异常
+		if (!wxResult.success()) {
+			saveOperation(formDTO.getCustomerId(), null, formDTO.getUserVersion(), CodeConstant.OPER_UPLOAD, wxResult.getErrorMsg());
+			throw new RenException(wxResult.getErrorCode(), wxResult.getErrorMsg());
+		}
 		//获取客户信息
 		CustomerDTO customerDTO = new CustomerDTO();
 		customerDTO.setId(formDTO.getCustomerId());
 		PaCustomerDTO paCustomerDTO = paCustomerService.get(formDTO.getCustomerId());
 		//将之前上传信息删除
-//		codeCustomerService.deleteCode(formDTO.getCustomerId(), formDTO.getClientType());
+		codeCustomerService.deleteCode(formDTO.getCustomerId(), formDTO.getClientType());
 
 		//将上传信息存入表中
 		CodeCustomerDTO codeCustomerDTO = ConvertUtils.sourceToTarget(formDTO, CodeCustomerDTO.class);