修改分润逻辑

pluss-api-page/src/main/java/cn/pluss/platform/controller/CashController.java

@@ -122,6 +122,7 @@ public class CashController {
       }
     }catch (Exception e){
       e.printStackTrace();
+      return ResultGenerator.genFailResult(e.getMessage());
     }
     return ResultGenerator.genFailResult("");
   }

pluss-service-bundle/src/main/java/cn/pluss/platform/cash/impl/CashServiceImpl.java

@@ -668,6 +668,7 @@ public class CashServiceImpl extends ServiceImpl<CashMapper, Cash> implements Ca
         switch (promotion.getTypeCode()){
             case "AG":
                 cashStatus=map.get("AG");
+                cashStatus.setStatus("1");
                 upStatus=map.get("SO");
                 break;
             case "SO":

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/LklPayService.java

@@ -701,36 +701,36 @@ public class LklPayService {
 //        mothod="api/v2/saas/query/wx_openid_query";
 
 
-//        String body="{\n" +
-//                "    \"ver\":\"1.0.0\",\n" +
-//                "    \"timestamp\":\""+req_time+"\",\n" +
-//                "    \"reqId\":\""+req_time+"\",\n" +
-//                "    \"reqData\":{\n" +
-//                "         \"merId\":\"8227910593200K2\",\n" +
-//                "         \"termId\":\"C7958968\",\n" +
-//                "         \"sn\":\"QR939000089076\",\n" +
-//                "         \"businessType\":\"1\",\n" +
-//                "         \"shopName\":\"天地鉴宝\",\n" +
-//                "         \"source\":\"LOAP\",\n" +
-//                "         \"merOrgNo\":\"966805\"\n" +
-//                "    }\n" +
-//                "}";
-//
-//        mothod="api/v2/iot/cloud/device/activate";
-
-
         String body="{\n" +
                 "    \"ver\":\"1.0.0\",\n" +
                 "    \"timestamp\":\""+req_time+"\",\n" +
                 "    \"reqId\":\""+req_time+"\",\n" +
                 "    \"reqData\":{\n" +
-                "        \"merId\":\"8227910593200K2\",\n" +
+                "         \"merId\":\"8227910729806KN\",\n" +
-                "        \"termId\":\"C7958968\",\n" +
+                "         \"termId\":\"F2131334\",\n" +
                 "         \"sn\":\"QR939000089076\",\n" +
-                "        \"source\":\"KSAAS\"\n" +
+                "         \"businessType\":\"1\",\n" +
+                "         \"shopName\":\"爱吃樱桃小的丸子\",\n" +
+                "         \"source\":\"LOAP\",\n" +
+                "         \"merOrgNo\":\"966805\"\n" +
                 "    }\n" +
                 "}";
-        mothod="api/v2/iot/cloud/device/deactivate";
+
+        mothod="api/v2/iot/cloud/device/activate";
+
+//
+//        String body="{\n" +
+//                "    \"ver\":\"1.0.0\",\n" +
+//                "    \"timestamp\":\""+req_time+"\",\n" +
+//                "    \"reqId\":\""+req_time+"\",\n" +
+//                "    \"reqData\":{\n" +
+//                "        \"merId\":\"8227910729806KN\",\n" +
+//                "        \"termId\":\"F2131334\",\n" +
+//                "        \"sn\":\"QR939000089076\",\n" +
+//                "        \"source\":\"KSAAS\"\n" +
+//                "    }\n" +
+//                "}";
+//        mothod="api/v2/iot/cloud/device/deactivate";
 
 
         String authorization = getAuthorization(body, appId, mchSerialNo, privateKeyPath);

pluss-service-bundle/src/main/java/cn/pluss/platform/klk/service/impl/LaKalaInterfaceImpl.java

@@ -1242,7 +1242,7 @@ public class LaKalaInterfaceImpl {
 
 
             JSONObject req=new JSONObject();
-            object.put("externalCustomerNo","8227910593200K2");
+            object.put("externalCustomerNo","8227910729806KN");
             byte[] privateKey = Base64.decodeBase64("MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp");
             byte[] bytes = RSAUtil.encryptByPrivateKey(object.toString().getBytes(), privateKey);
 
@@ -1262,23 +1262,25 @@ public class LaKalaInterfaceImpl {
 
                     System.out.println("解密后的数据:"+data);
 //
-//                    Long shopId=JSONObject.parseObject(data).getJSONArray("shopInfoList").getJSONObject(0).getLong("shopId");
+                    Long shopId=JSONObject.parseObject(data).getJSONArray("shopInfoList").getJSONObject(0).getLong("shopId");
-//                    object=new JSONObject();
+                    object=new JSONObject();
-//                    object.put("externalCustomerNo","8227910593200K2");
+                    object.put("externalCustomerNo","8227910729806KN");
-//                    object.put("bzPos","KLYX");
+                    object.put("bzPos","KLYX");
-//                    object.put("termNum",1);
+                    object.put("termNum",1);
-//                    object.put("fees",feeInfoDtos);
+                    object.put("fees",feeInfoDtos);
-//                    object.put("shopId",shopId);
+                    object.put("shopId",shopId);
-//                    object.put("attachments",null);
+                    object.put("attachments",null);
-//                    privateKey = Base64.decodeBase64("MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp");
+                    privateKey = Base64.decodeBase64("MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAIcHuPuAbeKgueevtuy4RdMCH/xhLFKniVAhgZb2BfQiSDP0moBF2DiISdTq2A2KvEDol2DQBaAslDFAERkyTDIrZl9iB6xiGUmS/pZULy/k6Q6uED01JDeJLomxh6Cxk7QYlJO0tBpM4Xxahs9h7k0j55ZTV9HPZnLGVaUqyEF5AgMBAAECgYAmugRHvXHGiapH1JF2GvOLrRRXYddAbWRoYvOzxCO4/QwQOpsFJwL4U745HpGQcLXFN/ASiBbU9XQbG/DLdS182qAjvdZVJOA2e3H3LhpY3D8ec3webO+0nGk6e4oWGG1efJLM88Nb0FtQiQ0E6z17Paw5AGvxMVBPbL5SoQfq8QJBANHQmvFkAWlBL2XTLPUXaj+NAJzolE90ctAquxfDcTtfEXv0JitC5bwTg87uNl7n4PUTmtMDIkse+D5vQ2CIF78CQQCkwOIMzedKtWhOEbdGxiz1Y/jkuA8yF7HREeC7X2Av0z2Gi3yltoJd0s6zLn+6zowQp1O/5U6ifrYCIObWlTTHAkA0WOZ/eWL8vr2zmvdpgtkIWAaiH0j5deU7WJ3rNODoXjS/h0+KlZs5zGijVT2Nei7fFnAXW33P3j8zXJEj4XCDAkAcrG0rKVLNz9C9dZveN3NvqdyRge8zGqiZ6HCia7ED4dHdbr1c4ezCg4Px72/PhU8fPt/2j+Qlp8PpjuxeAE3VAkBqUiVV9XZptFEXa/77rgHP3SWrC3TcrrS5jtNTGfA4VISV95YXnZzWjYfpgs2WoxdAXjsrM5TB7L3V4um4o6Dp");
-//                    bytes = RSAUtil.encryptByPrivateKey(object.toString().getBytes(), privateKey);
+                    bytes = RSAUtil.encryptByPrivateKey(object.toString().getBytes(), privateKey);
-//                    req=new JSONObject();
+                    req=new JSONObject();
-//                    req.put("data",Base64.encodeBase64String(bytes));
+                    req.put("data",Base64.encodeBase64String(bytes));
-//                    System.out.println("请求参数:"+object.toString());
+                    System.out.println("请求参数:"+object.toString());
-//                    result = cn.hutool.http.HttpRequest.post("https://tkapi.lakala.com/htkmerchants/open/merchant/addTerm")
+                    result = cn.hutool.http.HttpRequest.post("https://tkapi.lakala.com/htkmerchants/open/merchant/addTerm")
-//                            .header("Authorization", "bearer " + map.get("access_token")).header("content-type", "application/json")
+                            .header("Authorization", "bearer " + map.get("access_token")).header("content-type", "application/json")
-//                            .body(req.toString()).execute().body();
+                            .body(req.toString()).execute().body();
-//                    System.out.println("返回结果:" + result);
+                    System.out.println("返回结果:" + result);
+
+                    System.out.println("解密后结果:"+LaKaLaUtility.decrypt("MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCHB7j7gG3ioLnnr7bsuEXTAh/8YSxSp4lQIYGW9gX0Ikgz9JqARdg4iEnU6tgNirxA6Jdg0AWgLJQxQBEZMkwyK2ZfYgesYhlJkv6WVC8v5OkOrhA9NSQ3iS6JsYegsZO0GJSTtLQaTOF8WobPYe5NI+eWU1fRz2ZyxlWlKshBeQIDAQAB",result));
                 }
             }
 

pluss-service-bundle/src/main/java/cn/pluss/platform/merchantProfit/impl/MerchantProfitServiceImpl.java

@@ -171,6 +171,7 @@ public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper,
             log.error("订单号:{} 父级为:{},父级类型:{},分润结束，获取分润数为:{},",order.getOrderNumber(),userPromotion.getParentUserId(),userPromotion.getTypeCode(),profits.size());
             return;
         }
+
         BigDecimal profitRate = BigDecimal.ZERO;
 
         if (nowRate.compareTo(new BigDecimal(userPromotion.getCurrentFee())) >= 0) {
@@ -178,6 +179,10 @@ public class MerchantProfitServiceImpl extends ServiceImpl<MerchantProfitMapper,
             nowRate = new BigDecimal(userPromotion.getCurrentFee());
         }
 
+        if("0".equals(userPromotion.getIsExtend())||"3".equals(userPromotion.getIsExtend())){
+            createUserV3Profit(order,userPromotion.getParentUserId(),profits,nowRate);
+        }
+
         UserApp nowUserApp = userAppMapper.selectByUserId(userId);
         if(ObjectUtil.isEmpty(nowUserApp)){
             log.error("订单号:{},分润结束，获取分润数为:{}",order.getOrderNumber(),profits.size());