Merge branch 'feat-20220704-category2oladingv2'

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/config/UpmsConfig.java

@@ -42,4 +42,7 @@ public class UpmsConfig {
 	private String gigServiceUrl;
 
 
+	private Integer tagId;
+
+
 }

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

@@ -290,7 +290,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 			// 获取结算零工
 			GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(input.getSubType()));
-			if (gigTypeEnum == null){
+			if (gigTypeEnum == null) {
 				return R.failed(user.getRealname() + "人员结算渠道不存在，不能结算");
 			}
 
@@ -298,7 +298,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 					.eq(SysUserSub::getUserId, user.getUserId())
 			);
 
-			if (userSub == null){
+			if (userSub == null) {
 				return R.failed(user.getRealname() + "人员认证信息不存在，不能结算");
 			}
 
@@ -317,6 +317,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				default:
 					return R.failed(user.getRealname() + "人员结算渠道不存在，不能结算");
 			}
+
+			// 设置发票类目
+			note.setCategoryName(input.getCategoryName());
 		}
 
 		// 校验当月结算额度
@@ -395,7 +398,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			note.setSubTime(now);
 			note.setSubType(input.getSubType());
 			note.setInvoiceType(input.getInvoiceCategory());
-			note.setCategoryName(input.toCategoryName());
+			note.setCategoryName(input.getCategoryName());
 			if (null == note.getId()) {
 				note.setCreateTime(LocalDateTime.now());
 			}
@@ -442,7 +445,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			// 获取结算零工
 			GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(input.getSubType()));
 
-			if (gigTypeEnum == null){
+			if (gigTypeEnum == null) {
 				return R.failed(user.getRealname() + "人员结算渠道不存在，不能结算");
 			}
 
@@ -450,7 +453,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 					.eq(SysUserSub::getUserId, user.getUserId())
 			);
 
-			if (userSub == null){
+			if (userSub == null) {
 				return R.failed(user.getRealname() + "人员认证信息不存在，不能结算");
 			}
 
@@ -469,6 +472,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				default:
 					return R.failed(user.getRealname() + "人员结算渠道不存在，不能结算");
 			}
+
+			// 设置发票类目
+			note.setCategoryName(input.getCategoryName());
 		}
 
 		// 校验当月结算额度
@@ -547,7 +553,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 			note.setSubTime(now);
 			note.setSubType(input.getSubType());
 			note.setInvoiceType(input.getInvoiceCategory());
-			note.setCategoryName(input.toCategoryName());
+			// note.setCategoryName(input.toCategoryName());
+			note.setCategoryName(input.getCategoryName());
 			if (null == note.getId()) {
 				note.setCreateTime(LocalDateTime.now());
 			}
@@ -690,7 +697,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		 */
 		for (WmScorePackageSettleNote note : notes) {
 			note.setInvoiceType(input.getInvoiceCategory());
-			note.setCategoryName(input.toCategoryName());
+			// note.setCategoryName(input.toCategoryName());
+			note.setCategoryName(StrUtil.isNotBlank(input.getCategoryName()) ? input.getCategoryName() : note.getCategoryName());
 			note.setSubToGigTime(LocalDateTime.now());
 		}
 		noteService.updateBatchById(notes);
@@ -746,13 +754,13 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
 						String.valueOf(operator.getDeptId()), "settle", String.valueOf(operator.getId()));
 				log.warn("获取结算token：{}", tokenResult.getBody());
-				if (!JSONUtil.isJson(tokenResult.getBody())){
+				if (!JSONUtil.isJson(tokenResult.getBody())) {
 					return R.failed("获取结算token失败");
 				}
 
 				JSONObject jsonObject = JSONUtil.parseObj(tokenResult.getBody());
 
-				if (jsonObject.getInt("code") != 0 || StrUtil.isBlank(jsonObject.getStr("data"))){
+				if (jsonObject.getInt("code") != 0 || StrUtil.isBlank(jsonObject.getStr("data"))) {
 					return R.failed("获取结算token失败");
 				}
 
@@ -777,7 +785,9 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				params.put("idCard", sysUser.getIdCardNumber());
 				params.put("realName", sysUser.getRealname());
 				params.put("bankCard", sysUser.getBankCardNumber());
-				params.put("tagId", note.getInvoiceType());
+				// 市场推广
+				params.put("tagId", upmsConfig.getTagId());
+				params.put("taskInvoiceContent", note.getCategoryName());
 				params.put("endType", "CSO");
 				params.put("enterpriseCode", taxCode);
 				params.put("subjectType", "OLADING");
@@ -791,7 +801,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 				headers.setContentType(MediaType.APPLICATION_JSON);
 				HttpEntity<String> result = new RestTemplate().exchange(gigSettleUrl, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
 				log.warn("阿拉丁结算： {}", result.getBody());
-				if (!JSONUtil.isJson(result.getBody())){
+				if (!JSONUtil.isJson(result.getBody())) {
 					return R.failed("结算失败");
 				}
 				JSONObject settelObj = JSONUtil.parseObj(result.getBody());
@@ -819,7 +829,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 					redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 
 				}
-			} catch (Exception e){
+			} catch (Exception e) {
 				log.warn("自由职家结算提交失败： {}", note.getSettleNo());
 				note.setUpdateTime(LocalDateTime.now());
 				note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
@@ -1070,7 +1080,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 		 */
 		for (WmScorePackageSettleNote note : notes) {
 			note.setInvoiceType(input.getInvoiceCategory());
-			note.setCategoryName(input.toCategoryName());
+			// note.setCategoryName(input.toCategoryName());
+			note.setCategoryName(input.getCategoryName());
 			note.setSubToGigTime(LocalDateTime.now());
 		}
 		noteService.updateBatchById(notes);
@@ -1084,7 +1095,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 			);
 
-			if (userSub == null){
+			if (userSub == null) {
 				log.info("结算对象-" + sysUser.getRealname() + "：认证信息不存在，不能结算");
 				return R.failed("结算对象-" + sysUser.getRealname() + "：认证信息不存在，不能结算");
 			}
@@ -1210,7 +1221,8 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 
 		for (WmScorePackageSettleNote note : notes) {
 			note.setInvoiceType(input.getInvoiceCategory());
-			note.setCategoryName(input.toCategoryName());
+			// note.setCategoryName(input.toCategoryName());
+			note.setCategoryName(input.getCategoryName());
 			note.setSubToGigTime(LocalDateTime.now());
 		}
 		noteService.updateBatchById(notes);
@@ -1236,7 +1248,7 @@ public class WmPayOffServiceImpl extends ServiceImpl<WmPayOffMapper, WmPayOff> i
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 			);
 
-			if (userSub == null){
+			if (userSub == null) {
 				log.info("结算对象-" + sysUser.getRealname() + "：认证信息不存在，不能结算");
 				return R.failed("结算对象-" + sysUser.getRealname() + "：认证信息不存在，不能结算");
 			}

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

@@ -505,7 +505,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 		// 获取结算零工
 		GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
 
-		if (gigTypeEnum == null){
+		if (gigTypeEnum == null) {
 			return R.failed(sysUser.getRealname() + "人员结算渠道不存在，不能结算");
 		}
 
@@ -513,7 +513,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				.eq(SysUserSub::getUserId, sysUser.getUserId())
 		);
 
-		if (userSub == null){
+		if (userSub == null) {
 			return R.failed(sysUser.getRealname() + "人员认证信息不存在，不能结算");
 		}
 
@@ -618,7 +618,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			// 获取结算零工
 			GigTypeEnum gigTypeEnum = GigTypeEnum.resolve(Integer.parseInt(note.getSubType()));
 
-			if (gigTypeEnum == null){
+			if (gigTypeEnum == null) {
 				return R.failed(sysUser.getRealname() + "人员结算渠道不存在，不能结算");
 			}
 
@@ -626,7 +626,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 					.eq(SysUserSub::getUserId, sysUser.getUserId())
 			);
 
-			if (userSub == null){
+			if (userSub == null) {
 				return R.failed(sysUser.getRealname() + "人员认证信息不存在，不能结算");
 			}
 
@@ -666,7 +666,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 
 			}
 			// 自由职家
-			else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(note.getSubType())){
+			else if (SubjectTypeEnum.TYPE_OLADING.getCode().equals(note.getSubType())) {
 				oladingNoteList.add(note);
 			}
 			// 税邦云
@@ -699,7 +699,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			} else {
 				return R.failed("未配置企业的统一社会信用代码");
 			}
-			return batchSettleByOlading(oladingNoteList,taxCode);
+			return batchSettleByOlading(oladingNoteList, taxCode);
 			// return settleByTaxHelper();
 		}
 
@@ -707,12 +707,12 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 	}
 
 
-	private R settleByTaxHelper(){
+	private R settleByTaxHelper() {
 		return R.failed("因系统维护，暂时不能提起支付，有问题请联系客服");
 	}
 
 	/**
-	 * 税帮云结算
+	 * 哦拉丁结算
 	 *
 	 * @param noteList 结算记录
 	 * @param taxCode  企业三合一码
@@ -785,7 +785,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				params.put("idCard", note.getIdCardNumber());
 				params.put("realName", sysUser.getRealname());
 				params.put("bankCard", sysUser.getBankCardNumber());
-				params.put("tagId", note.getInvoiceType());
+				params.put("tagId", upmsConfig.getTagId());
+				params.put("taskInvoiceContent", note.getCategoryName());
 				params.put("endType", "CSO");
 				params.put("enterpriseCode", taxCode);
 				params.put("subjectType", "OLADING");
@@ -985,9 +986,9 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 	}
 
 	private R settleByOlading(WmScorePackageSettleNote note,
-								  WmScorePackage wmScorePackage,
-								  SysUser sysUser,
-								  String taxCode) {
+							  WmScorePackage wmScorePackage,
+							  SysUser sysUser,
+							  String taxCode) {
 
 		/**
 		 * 加锁
@@ -1008,13 +1009,13 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			ResponseEntity<String> tokenResult = new RestTemplate().getForEntity(gigTokenUrl, String.class,
 					String.valueOf(operator.getDeptId()), "settle", String.valueOf(operator.getId()));
 			log.warn("获取结算token：{}", tokenResult.getBody());
-			if (!JSONUtil.isJson(tokenResult.getBody())){
+			if (!JSONUtil.isJson(tokenResult.getBody())) {
 				return R.failed("获取结算token失败");
 			}
 
 			JSONObject jsonObject = JSONUtil.parseObj(tokenResult.getBody());
 
-			if (jsonObject.getInt("code") != 0 || StrUtil.isBlank(jsonObject.getStr("data"))){
+			if (jsonObject.getInt("code") != 0 || StrUtil.isBlank(jsonObject.getStr("data"))) {
 				return R.failed("获取结算token失败");
 			}
 
@@ -1039,7 +1040,8 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			params.put("idCard", sysUser.getIdCardNumber());
 			params.put("realName", sysUser.getRealname());
 			params.put("bankCard", sysUser.getBankCardNumber());
-			params.put("tagId", note.getInvoiceType());
+			params.put("tagId", upmsConfig.getTagId());
+			params.put("taskInvoiceContent", note.getCategoryName());
 			params.put("endType", "CSO");
 			params.put("enterpriseCode", taxCode);
 			params.put("subjectType", "OLADING");
@@ -1053,7 +1055,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 			headers.setContentType(MediaType.APPLICATION_JSON);
 			HttpEntity<String> result = new RestTemplate().exchange(gigSettleUrl, HttpMethod.POST, new HttpEntity<>(params, headers), String.class);
 			log.warn("阿拉丁结算： {}", result.getBody());
-			if (!JSONUtil.isJson(result.getBody())){
+			if (!JSONUtil.isJson(result.getBody())) {
 				return R.failed("结算失败");
 			}
 			JSONObject settelObj = JSONUtil.parseObj(result.getBody());
@@ -1078,7 +1080,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 				redisTemplate.delete(CacheConstants.SETTLE_PACKAGE_KEY + note.getId());
 
 			}
-		} catch (Exception e){
+		} catch (Exception e) {
 			log.warn("自由职家结算提交失败： {}", note.getSettleNo());
 			note.setUpdateTime(LocalDateTime.now());
 			note.setSettleNoteStatus(DingEnum.NOTE_STATUS_FAIL.getType());
@@ -1093,7 +1095,7 @@ public class WmScorePackageSettleNoteServiceImpl extends ServiceImpl<WmScorePack
 	}
 
 
-	private R settleByShuiBangYun(){
+	private R settleByShuiBangYun() {
 		return R.failed("因系统维护，暂时不能提起支付，有问题请联系客服");
 	}