canteen/src/main/java/com/youxianxin/common/utils/PayUtils.java

@@ -622,8 +622,12 @@ public class PayUtils {
         //websocket通知钉钉小程序
         //改到回调时通知
 //        WebSocket.AppointSending(dingUserId, jnOrder.getOrderId().toString());
-        Map map = new HashMap();
+        Map<String, String> map = new HashMap<>();
         map.put("ordeSn",orderSn);
+        map.put("userName", dingdingUser.getName());
+        map.put("price", priceAll);
+        map.put("personalBalance", dingdingUser.getPersonalBalance());
+        map.put("subsidyBalance", dingdingUser.getSubsidyBalance());
         return ReturnCode.back(200, "支付成功", map);
     }
 

clothCashier/app/src/main/java/com/cloth/clothcashier/ui/activity/LoginActivity.java

@@ -99,7 +99,10 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener
 
     private void initPermission() {
         RxPermissions rxPermissions = new RxPermissions(this);
-        rxPermissions.requestEachCombined(Manifest.permission.READ_PHONE_STATE)
+        rxPermissions.requestEachCombined(Manifest.permission.READ_PHONE_STATE,
+                Manifest.permission.CAMERA,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                Manifest.permission.READ_EXTERNAL_STORAGE)
                 .subscribe(permission -> {
                     if (permission.granted) {
                     } else {