更新

src/main/java/com/szwl/controller/TEquipmentController.java

@@ -522,7 +522,6 @@ public class TEquipmentController {
         JSONObject kindData = new JSONObject();
         kindData.put("id" , param.getId());
         kindData.put("content" , tAlarmRecord.getAlarmContent());
-        equipment.getGtClientId();
         tEquipmentService.sentMessage(equipment.getClientId(), PushUtils.buildJson("eliminate", kindData.toString()).toString());
 //        PushUtils.push(equipment.getGtClientId(), "", "", PushUtils.buildJson("eliminate", kindData.toString()).toString());
         return ResponseEntity.status(HttpStatus.OK)

src/main/java/com/szwl/controller/TJoinpayMchController.java

@@ -170,14 +170,37 @@ public class TJoinpayMchController {
     @ApiOperation(value = "获取提现信息")
     @GetMapping("/getMch")
     public ResponseModel<TJoinpayMch> getMch(@RequestParam String id) {
-        LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
-        query.eq(TJoinpayMch::getAdminId,Long.valueOf(id));
-        List<TJoinpayMch> list = tJoinpayMchService.list(query);
-        TJoinpayMch tJoinpayMch = list.get(0);
-        tJoinpayMchService.refreshMch(tJoinpayMch);
-        String s = tJoinpayMchService.refreshMyAccount(tJoinpayMch);
-        TJoinpayMch joinpayMch = tJoinpayMchService.getById(tJoinpayMch.getId());
-        return R.ok(joinpayMch);
+        TAdmin admin = adminService.getById(id);
+        if(!admin.getIsAdmined()){
+            if(admin.getType()<=1){
+                //公司
+                TJoinpayMch tJoinpayMch = new TJoinpayMch();
+                tJoinpayMch.setType("0");
+                return R.ok(tJoinpayMch);
+            }else {
+                //商家
+                TAdmin parentAdmin = adminService.getById(admin.getParentId());
+                LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
+                query.eq(TJoinpayMch::getAdminId,Long.valueOf(parentAdmin.getId()));
+                List<TJoinpayMch> list = tJoinpayMchService.list(query);
+                TJoinpayMch tJoinpayMch = list.get(0);
+                tJoinpayMchService.refreshMch(tJoinpayMch);
+                String s = tJoinpayMchService.refreshMyAccount(tJoinpayMch);
+                TJoinpayMch joinpayMch = tJoinpayMchService.getById(tJoinpayMch.getId());
+                return R.ok(joinpayMch);
+            }
+
+        }else {
+            LambdaQueryWrapper<TJoinpayMch> query = Wrappers.lambdaQuery();
+            query.eq(TJoinpayMch::getAdminId,Long.valueOf(id));
+            List<TJoinpayMch> list = tJoinpayMchService.list(query);
+            TJoinpayMch tJoinpayMch = list.get(0);
+            tJoinpayMchService.refreshMch(tJoinpayMch);
+            String s = tJoinpayMchService.refreshMyAccount(tJoinpayMch);
+            TJoinpayMch joinpayMch = tJoinpayMchService.getById(tJoinpayMch.getId());
+            return R.ok(joinpayMch);
+        }
+
     }
 
     private ResponseModel<?> createCheckMch(TJoinpayMch mch, TJoinpayMch tJoinpayMch) {

src/main/java/com/szwl/controller/TPromoCodeController.java

@@ -189,6 +189,7 @@ public class TPromoCodeController {
                 promoCode.setDiscount(0f);
                 promoCode.setLastUseDate(lastUseDate);
                 promoCode.setCreateDate(new Date());
+                promoCode.setType("0");
                 promoCode.setUserName(admin.getUsername());
                 promoCodeService.save(promoCode);
         }
@@ -414,7 +415,7 @@ public class TPromoCodeController {
                 order1.setClientId(equipment.getClientId());
                 order1.setStatus(0);
                 order1.setFrpCode(frpCode);
-//                order1.setRefundTrxNo(String.valueOf(month));
+                order1.setRefundTrxNo(String.valueOf(month));
                 order1.setCreateDate(new Date());
                 order1.setModifyDate(new Date());
                 payFeign.addOrder(order1);

src/main/java/com/szwl/controller/TProportionController.java

@@ -229,7 +229,7 @@ public class TProportionController {
             List<TAdmin> admins = adminService.list(queryTAdmin);
             if(admins.size()>0){
                 TAdmin tAdmin = admins.get(0);
-                agencyId = tAdmin.getAgencyId();
+                agencyId = tAdmin.getId();
             }else {
                 return R.fail("找不到第一个分账人！");
             }
@@ -241,7 +241,7 @@ public class TProportionController {
             List<TAdmin> admins1 = adminService.list(queryTAdmin1);
             if(admins1.size()>0){
                 TAdmin tAdmin = admins1.get(0);
-                merchantId = tAdmin.getAreaId();
+                merchantId = tAdmin.getId();
             }else {
                 return R.fail("找不到第二个分账人！");
             }
@@ -253,7 +253,7 @@ public class TProportionController {
             List<TAdmin> admins2 = adminService.list(queryTAdmin2);
             if(admins2.size()>0){
                 TAdmin tAdmin = admins2.get(0);
-                personageId = tAdmin.getAreaId();
+                personageId = tAdmin.getId();
             }else {
                 return R.fail("找不到第三个分账人！");
             }

src/main/resources/bootstrap.yml

@@ -3,7 +3,7 @@ spring:
     name: szwl-server
   profiles:
     # 打包或运行时，换这里：sit测试，prod正式
-    active: prod
+    active: sit
   cloud:
     config:
       name: szwl-server