Merge remote-tracking branch 'origin/temp-pre' into temp-pre

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

@@ -112,7 +112,7 @@ public class WmScorePackageController {
 
 	@PutMapping(value = "/p2p/amount")
 	@Transactional(rollbackFor = Exception.class)
-	public R<?> saveP2pAmount(WmScorePackage wmScorePackage) {
+	public R<?> saveP2pAmount(@RequestBody WmScorePackage wmScorePackage) {
 		if (StrUtil.isBlank(wmScorePackage.getId()) || wmScorePackage.getP2pAmount() == null) {
 			return R.failed("参数错误");
 		}
@@ -120,6 +120,7 @@ public class WmScorePackageController {
 		WmScorePackage sp = new WmScorePackage();
 		sp.setId(wmScorePackage.getId());
 		sp.setP2pAmount(wmScorePackage.getP2pAmount());
+		sp.setDescription(wmScorePackage.getDescription());
 		wmScorePackageService.save(sp);
 		return R.ok();
 	}

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

@@ -1618,6 +1618,11 @@ public class PartyAServiceImpl implements PartyAService {
 		} else if (CommonConstants.USER_AGREEMENT_SIGNATURE_METHOD.equals(methodName)
 				|| CommonConstants.USER_AGREEMENT_TEXT_METHOD.equals(methodName)) {
 			taxHelperCertStatusList.add(TaxHelperCertStatus.ADD_MEMBER.getCode());
+			taxHelperCertStatusList.add(TaxHelperCertStatus.CHECKED_UNBIND.getCode());
+			taxHelperCertStatusList.add(TaxHelperCertStatus.CHECKING_BIND.getCode());
+			taxHelperCertStatusList.add(TaxHelperCertStatus.CHECKING_UNBIND.getCode());
+			taxHelperCertStatusList.add(TaxHelperCertStatus.CERT.getCode());
+			taxHelperCertStatusList.add(TaxHelperCertStatus.UNCHECKED_BIND.getCode());
 		} else if (CommonConstants.H5_TOKEN_METHOD.equals(methodName)) {
 			taxHelperCertStatusList.add(TaxHelperCertStatus.ADD_MEMBER.getCode());
 			// 税邦云调整回调时间为24小时，允许中途再次获取token