Merge branch 'feat-wenwen3-20210923'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTaxHelperController.java

@@ -211,7 +211,7 @@ public class WmTaxHelperController {
 		SysUser user = userService.getById(hnqzUser.getId());
 
 		// 校验用户是否已经签署了信息
-		if(user.getTaxHelperAgreementSignature() == 1){
+		if (user.getTaxHelperAgreementSignature() == 1) {
 			return R.ok("已经签署");
 		}
 
@@ -248,7 +248,7 @@ public class WmTaxHelperController {
 			sysCertResultRecordMapper.insert(record);
 
 
-			if (!userAgreement.success()){
+			if (!userAgreement.success()) {
 				return R.failed(userAgreement);
 			}
 
@@ -868,7 +868,7 @@ public class WmTaxHelperController {
 	 */
 	@Inner(value = false)
 	@PostMapping(value = "/{user_id}/settlementNotify")
-	public TaxHelperResponse taxHelperSettlementNotify(@PathVariable(value = "user_id") String userId,
+	public String taxHelperSettlementNotify(@PathVariable(value = "user_id") String userId,
 													   @RequestBody String body) {
 		// 判断当前用户是否已经存在回调操作，避免多次回调
 		String cacheKey = CacheConstants.TAX_HELPER_SETTLEMENT_NOTIFY_KEY + userId;
@@ -876,7 +876,7 @@ public class WmTaxHelperController {
 
 		if (!absent) {
 			log.error("当前用户：{}，正在处理结算回调操作。", userId);
-			return new TaxHelperResponse("4000", "结算通知回调重复");
+			return responseJson(4000,"结算通知回调重复");
 		}
 
 		try {
@@ -904,7 +904,7 @@ public class WmTaxHelperController {
 		} catch (Exception e) {
 			log.error("税邦云解密失败");
 		}
-		return new TaxHelperResponse("2000", "结算通知回调成功");
+		return responseJson(2000,"结算通知回调成功");
 	}
 
 
@@ -918,9 +918,9 @@ public class WmTaxHelperController {
 	 */
 	@Inner(value = false)
 	@PostMapping(value = "/{user_id}/{version}/settlementNotify")
-	public TaxHelperResponse taxHelperSettlementNotifyV2(@PathVariable(value = "user_id") String userId,
-														 @PathVariable(value = "version") String version,
-														 @RequestBody String body) {
+	public String taxHelperSettlementNotifyV2(@PathVariable(value = "user_id") String userId,
+											  @PathVariable(value = "version") String version,
+											  @RequestBody String body) {
 
 		// 判断当前用户是否已经存在回调操作，避免多次回调
 		String cacheKey = CacheConstants.TAX_HELPER_SETTLEMENT_NOTIFY_KEY + userId;
@@ -929,7 +929,7 @@ public class WmTaxHelperController {
 
 		if (!absent) {
 			log.error("当前用户：{}，正在处理结算回调操作。", userId);
-			return new TaxHelperResponse("4000", "结算通知回调重复");
+			return responseJson(4000,"结算通知回调重复");
 		}
 
 		try {
@@ -963,6 +963,21 @@ public class WmTaxHelperController {
 		} catch (Exception e) {
 			log.error("税邦云解密失败");
 		}
-		return new TaxHelperResponse("2000", "结算通知回调成功");
+
+		return responseJson(2000,"结算通知回调成功");
+	}
+
+	/**
+	 * 获取响应结果
+	 *
+	 * @param code    响应状态码
+	 * @param message 响应信息
+	 * @return 响应json字符串
+	 */
+	private String responseJson(Integer code, String message) {
+		Map response = new HashMap(2);
+		response.put("code", code);
+		response.put("message", message);
+		return JSONUtil.toJsonStr(response);
 	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/PartyAServiceImpl.java

@@ -643,7 +643,8 @@ public class PartyAServiceImpl implements PartyAService {
 					.eq("score_package_name", scorePackageDTO.getName())
 					.eq("dept_id", scorePackageDTO.getDeptId()));
 			if (sp != null) {
-				return getResultMap("4000", "积分包名称重复");
+				// return getResultMap("4000", "积分包名称重复");
+				return getResultMap("2000", sp.getId());
 			}
 		} else {
 			return getResultMap("4000", "积分包名称为空");