|
@@ -665,7 +665,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
* 公司钱包充值
|
|
|
*/
|
|
|
@RequiresPermissions("system:dingUser:rechargeSubsidy")
|
|
|
- @Log(title = "钉钉用户信息", businessType = BusinessType.DELETE)
|
|
|
+ @Log(title = "公司钱包充值", businessType = BusinessType.DELETE)
|
|
|
@PostMapping("/rechargeSubsidyl")
|
|
|
@ResponseBody
|
|
|
public AjaxResult rechargeSubsidyl(HttpServletRequest request, HttpServletResponse response) {
|
|
@@ -701,12 +701,51 @@ public class JnDingdingUserController extends BaseController {
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
+ * 钉钉小程序解绑支付宝
|
|
|
+ */
|
|
|
+ @Log(title = "钉钉小程序解绑支付宝", businessType = BusinessType.DELETE)
|
|
|
+ @PostMapping("/ding/removeZFB")
|
|
|
+ @ResponseBody
|
|
|
+ public AjaxResult removeZFB(String id) throws AlipayApiException {
|
|
|
+ //批量支付宝解绑
|
|
|
+ boolean m = false;
|
|
|
+ AlipayClient alipayClient = new DefaultAlipayClient(AliPayConfig.GATEWAYURL,
|
|
|
+ AliPayConfig.APP_ID,
|
|
|
+ AliPayConfig.MERCHANT_PRIVATE_KEY,
|
|
|
+ "json",
|
|
|
+ AliPayConfig.CHARSET,
|
|
|
+ AliPayConfig.ALIPAY_PUBLIC_KEY,
|
|
|
+ AliPayConfig.SIGN_TYPE);
|
|
|
+ AlipayUserAgreementUnsignModel model = new AlipayUserAgreementUnsignModel();
|
|
|
+ AlipayUserAgreementUnsignRequest request = new AlipayUserAgreementUnsignRequest();
|
|
|
+
|
|
|
+ JnDingdingUser dingUser = jnDingdingUserService.selectJnDingdingUserById(Long.parseLong(id));
|
|
|
+ if (StringUtils.isNotEmpty(dingUser.getZfbBalance())) {
|
|
|
+ model.setAgreementNo(dingUser.getHold1());
|
|
|
+ model.setSignScene("INDUSTRY|CATERING");
|
|
|
+ request.setBizModel(model);
|
|
|
+ AlipayUserAgreementUnsignResponse response = alipayClient.execute(request);
|
|
|
+ dingUser.setZfbBalance(null);
|
|
|
+ dingUser.setHold1(null);
|
|
|
+ if (jnDingdingUserService.updateJnDingUserZFBById(dingUser) <= 0) {
|
|
|
+ m = true;
|
|
|
+ }
|
|
|
+ } else {
|
|
|
+ return AjaxResult.error("支付宝账号不存在!");
|
|
|
+ }
|
|
|
+ if (m) {
|
|
|
+ return AjaxResult.error("解绑失败");
|
|
|
+ }
|
|
|
+ return AjaxResult.success("操作成功!");
|
|
|
+ }
|
|
|
+
|
|
|
+ /**
|
|
|
* 批量支付宝解绑——钉钉端绑定支付宝后,后台保存支付宝appId和支付宝账号
|
|
|
*/
|
|
|
- @Log(title = "钉钉用户信息", businessType = BusinessType.DELETE)
|
|
|
+ @Log(title = "批量解绑支付宝", businessType = BusinessType.DELETE)
|
|
|
@PostMapping("/removeZFB")
|
|
|
@ResponseBody
|
|
|
- public AjaxResult removeZFB(String ids) throws AlipayApiException {
|
|
|
+ public AjaxResult removeBatchZFB(String ids) throws AlipayApiException {
|
|
|
//批量支付宝解绑
|
|
|
boolean m = false;
|
|
|
String[] split = ids.split(",");
|
|
@@ -932,7 +971,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-查询个人钱包金额
|
|
|
*/
|
|
|
- @PostMapping("/personalBalance")
|
|
|
+ @PostMapping("/ding/personalBalance")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-查询个人钱包金额", notes = "钉钉-查询个人钱包金额")
|
|
|
public AjaxResult personalBalance(@RequestBody String jsonStr) {
|
|
@@ -950,7 +989,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-个人钱包明细
|
|
|
*/
|
|
|
- @PostMapping("/personalDetailed")
|
|
|
+ @PostMapping("/ding/personalDetailed")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-个人钱包明细", notes = "钉钉-个人钱包明细")
|
|
|
public AjaxResult personalDetailed(@RequestBody String jsonStr) {
|
|
@@ -1006,7 +1045,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-工牌挂失
|
|
|
*/
|
|
|
- @PostMapping("/reportCard")
|
|
|
+ @PostMapping("/ding/reportCard")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-工牌挂失", notes = "钉钉-工牌挂失")
|
|
|
public AjaxResult reportCard(@RequestBody String jsonStr) {
|
|
@@ -1049,7 +1088,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-查询工牌挂失
|
|
|
*/
|
|
|
- @GetMapping("/getReportCard")
|
|
|
+ @GetMapping("/ding/getReportCard")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-查询挂失", notes = "钉钉-查询挂失")
|
|
|
public AjaxResult getReportCard(String userId) {
|
|
@@ -1060,7 +1099,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-工牌解除挂失
|
|
|
*/
|
|
|
- @PostMapping("/unReportCard")
|
|
|
+ @PostMapping("/ding/unReportCard")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-工牌解除挂失", notes = "钉钉-工牌解除挂失")
|
|
|
public AjaxResult unReportCard(@RequestBody String jsonStr) {
|
|
@@ -1104,7 +1143,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-消费明细
|
|
|
*/
|
|
|
- @GetMapping("/getConsumeList")
|
|
|
+ @GetMapping("/ding/getConsumeList")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-消费明细", notes = "钉钉-消费明细")
|
|
|
public AjaxResult getConsumeList(String userId) {
|
|
@@ -1121,7 +1160,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-消费详情
|
|
|
*/
|
|
|
- @GetMapping("/getConsumeDetails")
|
|
|
+ @GetMapping("/ding/getConsumeDetails")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-消费详情", notes = "钉钉-消费详情")
|
|
|
public AjaxResult getConsumeDetails(Long orderId) {
|
|
@@ -1132,7 +1171,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 钉钉-充值详情
|
|
|
*/
|
|
|
- @GetMapping("/getRechargeDetails")
|
|
|
+ @GetMapping("/ding/getRechargeDetails")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-充值详情", notes = "钉钉-充值详情")
|
|
|
public AjaxResult getrRechargeDetails(Long rechargeId) {
|
|
@@ -1143,7 +1182,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 查询公司钱包余额
|
|
|
*/
|
|
|
- @GetMapping("/getSubsidyBalance")
|
|
|
+ @GetMapping("/ding/getSubsidyBalance")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-公司钱包", notes = "钉钉-公司钱包")
|
|
|
public AjaxResult getrSubsidyBalance(String userId) {
|
|
@@ -1154,7 +1193,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
/**
|
|
|
* 查询餐贴到帐记录
|
|
|
*/
|
|
|
- @PostMapping("/getSubsidyRechargeRecord")
|
|
|
+ @PostMapping("/ding/getSubsidyRechargeRecord")
|
|
|
@ResponseBody
|
|
|
@ApiOperation(value = "钉钉-公司钱包", notes = "钉钉-公司钱包")
|
|
|
public AjaxResult getrSubsidyRechargeRecord(@RequestBody JnRechargeRecord jnRechargeRecord) {
|
|
@@ -1193,7 +1232,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
* 调用支付宝签约接口
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
- @PostMapping("/alipaySignup")
|
|
|
+ @PostMapping("/ding/alipaySignup")
|
|
|
public AjaxResult alipaySignup(@RequestBody JnDingdingUser dingdingUser) throws AlipayApiException, IOException, WriterException {
|
|
|
|
|
|
AlipayClient alipayClient = new DefaultAlipayClient(AliPayConfig.GATEWAYURL,
|
|
@@ -1239,7 +1278,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
AlipayUserAgreementPageSignRequest request = new AlipayUserAgreementPageSignRequest();
|
|
|
request.setBizModel(bizModel);
|
|
|
// 异步通知服务器地址写在application.yml中
|
|
|
- String notifyUrl = severUrl + "/system/dingUser/signupNotify";
|
|
|
+ String notifyUrl = severUrl + "/system/dingUser/ding/signupNotify";
|
|
|
request.setNotifyUrl(notifyUrl);
|
|
|
AlipayUserAgreementPageSignResponse response = alipayClient.pageExecute(request, "get");
|
|
|
String url = response.getBody();
|
|
@@ -1321,7 +1360,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
AlipayUserAgreementPageSignRequest request = new AlipayUserAgreementPageSignRequest();
|
|
|
request.setBizModel(bizModel);
|
|
|
// 异步通知服务器地址写在application.yml中
|
|
|
- String notifyUrl = severUrl + "/system/dingUser/signupNotify";
|
|
|
+ String notifyUrl = severUrl + "/system/dingUser/ding/signupNotify";
|
|
|
request.setNotifyUrl(notifyUrl);
|
|
|
AlipayUserAgreementPageSignResponse response = alipayClient.pageExecute(request, "get");
|
|
|
String url = response.getBody();
|
|
@@ -1371,7 +1410,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
* 签约异步通知接口
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
- @PostMapping("/signupNotify")
|
|
|
+ @PostMapping("/ding/signupNotify")
|
|
|
public String signupNotify(HttpServletRequest request) throws AlipayApiException, UnsupportedEncodingException {
|
|
|
//获取支付宝POST过来反馈信息
|
|
|
Map<String, String> params = new HashMap<>();
|
|
@@ -1543,7 +1582,7 @@ public class JnDingdingUserController extends BaseController {
|
|
|
* 生成二维码字符串
|
|
|
*/
|
|
|
@ResponseBody
|
|
|
- @PostMapping("/getEncryptCode")
|
|
|
+ @PostMapping("/ding/getEncryptCode")
|
|
|
public AjaxResult getEncryptCode(@RequestBody JnDingdingUser user) {
|
|
|
String userid = user.getUserid();
|
|
|
if (StringUtils.isEmpty(userid)){
|
|
@@ -1561,4 +1600,21 @@ public class JnDingdingUserController extends BaseController {
|
|
|
}
|
|
|
return AjaxResult.error("获取二维码错误");
|
|
|
}
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取用户人脸照片
|
|
|
+ * @param user
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ @ResponseBody
|
|
|
+ @PostMapping("/ding/getFacePic")
|
|
|
+ public AjaxResult getFacePic(@RequestBody JnDingdingUser user){
|
|
|
+ String userid = user.getUserid();
|
|
|
+ if (StringUtils.isEmpty(userid)){
|
|
|
+ return AjaxResult.error("参数错误");
|
|
|
+ }
|
|
|
+ JnDingdingUser dingUser = jnDingdingUserService.selectJnDingdingUserByUserId(userid);
|
|
|
+ return AjaxResult.success("", dingUser.getHold3());
|
|
|
+ }
|
|
|
+
|
|
|
}
|