地址替换成hxxfb.com的服务器

api/src/main/resources/application.yml

@@ -17,6 +17,8 @@ eureka:
   instance:
     prefer-ip-address: true #使用ip地址注册
 
+
+
 #日志格式化  只输出日期和内容
 logging:
   pattern:

commons-pojo/src/main/java/com/bjtdba/entity/thirdPartyWares/WaresDetail.java

@@ -40,6 +40,14 @@ public class WaresDetail {
     private BigDecimal yanglao;//养老金
     private BigDecimal gongxian;//新增贡献值值 20250107
     private BigDecimal jifen;//新增积分值 20250107
+    private BigDecimal pv;
+    public BigDecimal getPv() {
+        return pv;
+    }
+
+    public void setPv(BigDecimal pv) {
+        this.pv = pv;
+    }
     
     public BigDecimal getJifen() {
         return jifen;

commons-pojo/src/main/java/com/bjtdba/utils/aliyunDysmsapiUtil.java

@@ -26,11 +26,11 @@ public class aliyunDysmsapiUtil {
         return new Client(config);
     }
     public static SendSmsResponse ceshi(String phone,int mobile_code) throws Exception {
-        Client client = aliyunDysmsapiUtil.createClient("LTAI5tRfUFtmr5VFjqJ9D4dA","o6KrEEHr6WcpP0nu7TnP6ywnXPpVQm");
+        Client client = aliyunDysmsapiUtil.createClient("LTAI5tKivJSckMYz5BHev3u8","nvetSdLB1YP7OgvpJcVeyhdJDVs4Ik");
         String code = "{\"code\":"+mobile_code+"}";
         SendSmsRequest sendSmsRequest = new SendSmsRequest();
-        sendSmsRequest.setSignName("储蓄保");
-        sendSmsRequest.setTemplateCode("SMS_247420027");
+        sendSmsRequest.setSignName("融合华夏");
+        sendSmsRequest.setTemplateCode("SMS_311255692");
         sendSmsRequest.setPhoneNumbers(phone);
         sendSmsRequest.setTemplateParam(code);
         RuntimeOptions runtime = new RuntimeOptions();

eureka_server/src/main/resources/application.yml

@@ -1,6 +1,8 @@
 server:
   port: 8000 #端口
 
+
+
 #配置eureka
 eureka:
   instance:

gateWay_server/src/main/resources/application-dev.yml

@@ -49,10 +49,10 @@
           - Path=/sysmanage_service/**
 
   redis:
-    host: 10.30.0.46
+    host: 60.205.129.253
     port: 6379
     password: bjtdba
-    database: 0
+    database: 6
     timeout: 5000
     jedis:
       pool:

gateWay_server/src/main/resources/application-pro.yml

@@ -49,7 +49,10 @@
           - Path=/sysmanage_service/**
 
   redis:
-    host: 8.141.0.149
+#    host: 8.141.0.149
+#    port: 6379
+#    password: bjtdba
+    host: 123.56.214.150
     port: 6379
     password: bjtdba
     database: 6

gateWay_server/src/main/resources/application.yml

@@ -4,7 +4,7 @@ spring:
   application:
     name: gateWay-server
   profiles:
-    active: pro
+    active: dev
 
 
 

merchant_service/src/main/java/com/bjtdba/merchant/controller/HuifuController.java

@@ -69,6 +69,8 @@ public class HuifuController {
                 String member_id = (String) jsonObject.get("member_id");
                 String audit_state = (String) jsonObject.get("audit_state");
                 String order_no = (String) jsonObject.get("order_no");
+                String settle_account_id = (String) jsonObject.get("id");
+                log.info("汇付返回+++++"+jsonObject.toJSONString());
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
                 if(audit_state.equals("A")){  //audit_desc
                     //A-待审核
@@ -98,7 +100,7 @@ public class HuifuController {
                      * 1、使用用户uid 查询商户ID
                      */
                     List<Merchant> merchant= merchantDao.selectListByUId(uid);
-                    merchantMemberService.insterMerchantMember(merchant.get(0).getMer_id(),2,member_id);//保存商户支付id
+                    merchantMemberService.insterMerchantMember(merchant.get(0).getMer_id(),2,member_id,settle_account_id);//保存商户支付id
                     if(merchant.size()==1){
                         //调用第二个微信的注册方法
                         merchantSettleInService.executeCreateHuiFuWx2(1,merchant.get(0).getMer_id());
@@ -138,6 +140,8 @@ public class HuifuController {
                 String member_id = (String) jsonObject.get("member_id");
                 String audit_state = (String) jsonObject.get("audit_state");
                 String order_no = (String) jsonObject.get("order_no");
+                String settle_account_id = (String) jsonObject.get("id");
+                log.info("汇付返回+++++"+jsonObject.toJSONString());
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
                 if(audit_state.equals("A")){  //audit_desc
                     //A-待审核
@@ -167,7 +171,7 @@ public class HuifuController {
                      * 1、使用用户uid 查询商户ID
                      */
                     List<Merchant> merchant= merchantDao.selectListByUId(uid);
-                    merchantMemberService.insterMerchantMember(merchant.get(0).getMer_id(),3,member_id);//保存商户支付id
+                    merchantMemberService.insterMerchantMember(merchant.get(0).getMer_id(),3,member_id,settle_account_id);//保存商户支付id
                     if(merchant.size()==1){
                         //这块调用阿里
                         merchantSettleInService.executeCreateHuiFuAli(1,merchant.get(0).getMer_id());
@@ -206,6 +210,8 @@ public class HuifuController {
                 String member_id = (String) jsonObject.get("member_id");
                 String audit_state = (String) jsonObject.get("audit_state");
                 String order_no = (String) jsonObject.get("order_no");
+                String settle_account_id = (String) jsonObject.get("id");
+                log.info("汇付返回阿里+++++"+jsonObject.toJSONString());
                 int uid =  hfUserOrderDao.selectByOrderNo(order_no);
                 if(audit_state.equals("A")){  //audit_desc
                     //A-待审核
@@ -230,7 +236,7 @@ public class HuifuController {
                     int status = 1;
                     merchantDao.updateHuiByUid(member_id,null,uid);
                     List<Merchant> merchant= merchantDao.selectListByUId(uid);
-                    merchantMemberService.insterMerchantMember(merchant.get(0).getMer_id(),1,member_id);//保存商户支付id
+                    merchantMemberService.insterMerchantMember(merchant.get(0).getMer_id(),1,member_id,settle_account_id);//保存商户支付id
                     merchantIntentionDao.updateResultByUid("开店成功",status,uid);
                 }
                 log.info("member_id="+member_id+"audit_state="+audit_state);

merchant_service/src/main/java/com/bjtdba/merchant/controller/SystemConfigValueController.java

@@ -59,7 +59,7 @@ public class SystemConfigValueController {
                 //添加进去
                 SystemConfigValue rrxSystemConfigValue = new SystemConfigValue();
                 rrxSystemConfigValue.setConfigKey("base_commission");
-                rrxSystemConfigValue.setValue("0");
+                rrxSystemConfigValue.setValue("5");
                 rrxSystemConfigValue.setCreateTime(new Date());
                 rrxSystemConfigValue.setMerId(merId);
                 systemConfigValueService.insert(rrxSystemConfigValue);
@@ -95,8 +95,8 @@ public class SystemConfigValueController {
             return ResponseUtil.fail();
         }
         Double objvalue=Double.parseDouble(value);
-        if(objvalue<0||objvalue>100){
-            return ResponseUtil.fail();
+        if(objvalue<5||objvalue>100){
+            return ResponseUtil.fail("您已经开通消分设置，您的分润值，应该大于等5");
         }
 
         SystemConfigValue systemConfigValue=new SystemConfigValue();
@@ -130,13 +130,14 @@ public class SystemConfigValueController {
      */
     @PostMapping("/getShopBonusSetting")
     public Object getShopBonusSetting(@RequestBody Map<String,String> map){
-        return systemConfigValueService.getShopBonusSetting(map.get("mer_id"));
+
+        return ResponseUtil.ok(systemConfigValueService.getShopBonusSetting(map.get("mer_id"))) ;
     }
     /**
      * 获取配置
      */
     @PostMapping("/updateShopBonusSetting")
     public Object updateShopBonusSetting(@RequestBody Map<String,String> map){
-        return systemConfigValueService.updateShopBonusSetting(map.get("mer_id"),map.get("value"));
+        return ResponseUtil.ok(systemConfigValueService.updateShopBonusSetting(map.get("mer_id"),map.get("value")));
     }
 }

merchant_service/src/main/java/com/bjtdba/merchant/dao/MerchantMemberDao.java

@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
 @Mapper
 public interface MerchantMemberDao {
 
-    int insterMerchantMember(int mer_id, int type, String member_id);
+    int insterMerchantMember(int mer_id, int type, String member_id,String settle_account_id);
 
 }

merchant_service/src/main/java/com/bjtdba/merchant/dao/OrderMerchantDao.java

@@ -12,7 +12,11 @@ import java.util.Map;
 public interface OrderMerchantDao {
 
     Map<String, Long> belowTheLineSum(int mer_id, String start_time, String end_time);
+    Integer belowTheLineNumber(int mer_id, String start_time, String end_time);
 
     List<PayUser> belowTheLineList(int mer_id);
 
+    String jingdouSum(int mer_id, long start_time, long end_time);
+    String gongxianSum(int mer_id, long start_time, long end_time);
+
 }

merchant_service/src/main/java/com/bjtdba/merchant/service/MerchantMemberService.java

@@ -5,5 +5,5 @@ package com.bjtdba.merchant.service;
  * @Date:2022/12/5
  */
 public interface MerchantMemberService {
-    int insterMerchantMember(Integer mer_id, int type, String member_id);
+    int insterMerchantMember(Integer mer_id, int type, String member_id,String settle_account_id);
 }

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/AdapayServiceImpl.java

@@ -109,14 +109,14 @@ public class AdapayServiceImpl implements AdapayService {
                 String hf_member_id = settleCount.get("member_id").toString();//写到店铺表中
                 merchantDao.updateHuiByUid(hf_member_id,null,merchantIntention.getUid());
                 merchantIntentionDao.updateResultByUid("线下支付已授权",status,merchantIntention.getUid());
-                merchantMemberService.insterMerchantMember(merchantIntention.getMer_id(),1,member_id);//保存商户支付id
+                merchantMemberService.insterMerchantMember(merchantIntention.getMer_id(),1,member_id,settleCount.get("id").toString());//保存商户支付id
             }else if(settleCount.get("app_id").equals(resourceConfig.getWx_app_id())){//微信1
                 String hf_member_id_wx = settleCount.get("member_id").toString();//写到店铺表中
                 merchantDao.updateHuiByUid(null,hf_member_id_wx,merchantIntention.getUid());
                 merchantIntentionDao.updateResultByUid("线下支付已授权",status,merchantIntention.getUid());
-                merchantMemberService.insterMerchantMember(merchantIntention.getMer_id(),2,member_id);//保存商户支付id
+                merchantMemberService.insterMerchantMember(merchantIntention.getMer_id(),2,member_id,settleCount.get("id").toString());//保存商户支付id
             }else if(settleCount.get("app_id").equals(resourceConfig.getWx2_app_id())){//微信2
-                merchantMemberService.insterMerchantMember(merchantIntention.getMer_id(),3,member_id);//保存商户支付id
+                merchantMemberService.insterMerchantMember(merchantIntention.getMer_id(),3,member_id,settleCount.get("id").toString());//保存商户支付id
             }
         }else{
             log.info("个人结算账户提交失败"+JSON.toJSONString(settleCount));
@@ -160,7 +160,7 @@ public class AdapayServiceImpl implements AdapayService {
             memberParams.put("social_credit_code_expires", merchantIntention.getMerc_end_time().replaceAll("-", ""));
         }
         if (memberParams.get("social_credit_code_expires").toString().equals("20991231")) {
-            memberParams.replace("social_credit_code_expires", "20991231长期");
+            memberParams.replace("social_credit_code_expires", "20991231");
         }
         memberParams.put("business_scope", "小商品");
         memberParams.put("legal_person", merchantIntention.getName());

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/MerchantCashierServiceImpl.java

@@ -7,12 +7,14 @@ import com.bjtdba.merchant.dao.*;
 import com.bjtdba.merchant.dto.PayUser;
 import com.bjtdba.merchant.service.MerchantCashierService;
 import com.bjtdba.merchant.vo.MerchantCashierShow;
+import com.bjtdba.utils.DateUtils;
 import com.bjtdba.utils.QRCodeUtil;
 import com.bjtdba.utils.ResponseUtil;
 import com.bjtdba.utils.uploadDownload;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import javafx.scene.input.DataFormat;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -23,6 +25,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
@@ -134,22 +137,43 @@ public class MerchantCashierServiceImpl implements MerchantCashierService {
     }
     @Override
     public Object selectMerchantOrder(int mer_id, String start_time, String end_time) {
-        Map<String,Object> data=new HashMap<String,Object>();
-        Map<String,Long> orderLineOrderSun = storeOrderDao.onLineOrdeSun(mer_id,start_time,end_time);
-        Map<String,Long> belowTheLineSum = orderMerchantDao.belowTheLineSum(mer_id,start_time,end_time);
-        Double consumption = merchantConsumptionScoreLog.selectConsumptionScore(1,null,mer_id);
-        int sun = userDao.selectByMerId(mer_id,start_time,end_time);
-        int visitorNumber = userVisitDao.selectVisitorNumberByMerId(mer_id,start_time,end_time);
-        Long a = orderLineOrderSun.get("orderLineNumber");
-        Long b = belowTheLineSum.get("belowTheLineNumber");
-        Long number = orderLineOrderSun.get("orderLineNumber") + belowTheLineSum.get("belowTheLineNumber");
-        data.put("orderLineOrderSun",orderLineOrderSun);
-        data.put("belowTheLineSum",belowTheLineSum);
-        data.put("consumption",consumption);
-        data.put("sun",sun);
-        data.put("visitorNumber",visitorNumber);
-        data.put("number",number);
+        try {
+            Map<String,Object> data=new HashMap<String,Object>();
+            Map<String,Long> orderLineOrderSun = storeOrderDao.onLineOrdeSun(mer_id,start_time,end_time);
+            Map<String,Long> belowTheLineSum = orderMerchantDao.belowTheLineSum(mer_id,start_time,end_time);
+            Double consumption = merchantConsumptionScoreLog.selectConsumptionScore(1,null,mer_id);
+            int sun = userDao.selectByMerId(mer_id,start_time,end_time);
+            int visitorNumber = userVisitDao.selectVisitorNumberByMerId(mer_id,start_time,end_time);
+            int xianxiarenshu=orderMerchantDao.belowTheLineNumber(mer_id,start_time,end_time);
+            //20250227 添加京豆，贡献值
+            SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd");
+
+            SimpleDateFormat sdfHH=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
+            Date startDate=sdfHH.parse(start_time+" 00:00:00");
+            Date endDate=sdfHH.parse(end_time+" 23:59:59");
+            long stimeL=startDate.getTime()/1000; //10位的时间戳
+            long endtimeL=endDate.getTime()/1000;  //10位的时间戳
+            String jingdousum=orderMerchantDao.jingdouSum(mer_id,stimeL,endtimeL);
+            String gongxianSumsum=orderMerchantDao.gongxianSum(mer_id,stimeL,endtimeL);
+
+
+            Long a = orderLineOrderSun.get("orderLineNumber");
+            Long b = belowTheLineSum.get("belowTheLineNumber");
+            Long number = orderLineOrderSun.get("orderLineNumber") + xianxiarenshu;
+            data.put("orderLineOrderSun",orderLineOrderSun);
+            data.put("belowTheLineSum",belowTheLineSum);
+            data.put("consumption",consumption);
+            data.put("jingdousum",jingdousum);
+            data.put("gongxianSumsum",gongxianSumsum);
+            data.put("sun",sun);
+            data.put("visitorNumber",visitorNumber);
+            data.put("number",number);
         return ResponseUtil.ok(data);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return ResponseUtil.fail();
+        }
     }
 
     @Override
@@ -227,7 +251,7 @@ public class MerchantCashierServiceImpl implements MerchantCashierService {
             //添加进去
             SystemConfigValue rrxSystemConfigValue = new SystemConfigValue();
             rrxSystemConfigValue.setConfigKey("base_commission");
-            rrxSystemConfigValue.setValue("2");
+            rrxSystemConfigValue.setValue("5");
             rrxSystemConfigValue.setCreateTime(new Date());
             rrxSystemConfigValue.setMerId(mer_id1);
             int configStatus = systemConfigValueDao.insert(rrxSystemConfigValue);

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/MerchantMemberServiceImpl.java

@@ -16,8 +16,8 @@ public class MerchantMemberServiceImpl implements MerchantMemberService {
     private MerchantMemberDao merchantMemberDao;
 
     @Override
-    public int insterMerchantMember(Integer mer_id, int type, String member_id) {
-        merchantMemberDao.insterMerchantMember(mer_id,type,member_id);
+    public int insterMerchantMember(Integer mer_id, int type, String member_id,String settle_account_id) {
+        merchantMemberDao.insterMerchantMember(mer_id,type,member_id,settle_account_id);
         return 0;
     }
 }

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/MerchantSettleInServiceImpl.java

@@ -16,6 +16,7 @@ import com.bjtdba.utils.ResponseUtil;
 import com.bjtdba.utils.uploadDownload;
 import com.huifu.adapay.Adapay;
 import com.huifu.adapay.model.MerConfig;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -46,6 +47,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Stream;
 
 @Service
+@Slf4j
 public class MerchantSettleInServiceImpl implements MerchantSettleInService {
 
     @Autowired
@@ -185,12 +187,14 @@ public class MerchantSettleInServiceImpl implements MerchantSettleInService {
 
     @Override
     public Object insertMerchantSettlen(MerchantIntention merchantIntention) throws Exception {
+        log.info("进入提交方法");
         Map<String,Object> data=new HashMap<String,Object>();
         merchantIntention.setStatus(0);
         List<Merchant> merchant= merchantDao.selectListByUId(merchantIntention.getUid());
-        if(merchant.size()==0){
+        if(merchant==null||merchant.size()==0){
             Integer mer_id = insterMerchant(merchantIntention);//将数据存到店铺表中
             //生产二维码
+            log.info("准备添加收款吗");
             insterQrCode(merchantIntention.getUid(),mer_id);
             merchantIntention.setMer_id(mer_id);
             boolean merchantAdmin = insterMerchantAdmin(merchantIntention);//将数据添加到店铺管理员表中
@@ -446,6 +450,7 @@ public class MerchantSettleInServiceImpl implements MerchantSettleInService {
 
     @Override
     public Object updateMerchaSettlen(MerchantIntention merchantIntention) throws Exception {
+        log.info("进入商户更新方法");
         merchantIntention.setStatus(0);
         //修改数据数据存到店铺表中
         boolean updateMerchant = updateMerchant(merchantIntention);
@@ -457,6 +462,7 @@ public class MerchantSettleInServiceImpl implements MerchantSettleInService {
             //判断该商户是否有首款二维码，如果有不添加，如果没有就添加
             Map<String, String> map = merchantQrcodeDao.selectMerchantQrcodeByMerId(merchantIntention.getMer_id());
             if(map == null){
+                log.info("准备添加收款吗");
                 insterQrCode(merchantIntention.getUid(),merchantIntention.getMer_id());
             }
             executeCreateHuiFuWx1(1,merchantIntention.getMer_id());//微信
@@ -668,7 +674,7 @@ public class MerchantSettleInServiceImpl implements MerchantSettleInService {
     /**
      * 生产二维码的方法
      */
-    public boolean insterQrCode(int uid,int mer_id)throws Exception{
+    public boolean insterQrCode(int uid,int mer_id){
         /**
          * 1、生成时间戳   充当二维码的code以及名称
          * 2、将本地的二维码上传到远程数据库
@@ -681,32 +687,39 @@ public class MerchantSettleInServiceImpl implements MerchantSettleInService {
 
 
 //        生产环境：https://offlinepay.bjtdba.com/mer_id=148
-        long timeNew = System.currentTimeMillis(); // 13位数的时间戳    这个也是code
-        String text = zhifuurl+mer_id;
-        // 嵌入二维码的图片路径
-        String imgPath = "";
-        // 生成的二维码的路径及名称
-        String destPath = "/Users/hanyuxing/qrcode/"+timeNew+".jpg";
-        //生成二维码
-        QRCodeUtil.encode(text, imgPath, destPath, true);
-        // 解析二维码
-        String str = QRCodeUtil.decode(destPath);
-        // 打印出解析出的内容
-        System.out.println(str);
-        //上传二维码到c d n
-        File file = new File(destPath);
-        FileInputStream input = new FileInputStream(file);
-        MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
-        Map<String, String> qrCode = uploadDownload.qrCode(multipartFile);
-        MerchantQrcode merchantQrcode = new MerchantQrcode();
-        merchantQrcode.setUid(uid);
-        merchantQrcode.setMer_id(mer_id);
-        merchantQrcode.setCode_id("");
-        merchantQrcode.setQrcode_src(qrCode.get("url"));
-        merchantQrcode.setShow_src(qrCode.get("url"));
-        merchantQrcodeDao.insterMerchantQrcode(merchantQrcode);
-        deleteDir(new File("/Users/hanyuxing/qrcode"));
-        return true;
+        log.info("已经进入生成收款方法");
+        try {
+            long timeNew = System.currentTimeMillis(); // 13位数的时间戳    这个也是code
+            String text = zhifuurl + mer_id;
+            // 嵌入二维码的图片路径
+            String imgPath = "";
+            // 生成的二维码的路径及名称
+            String destPath = "/Users/hanyuxing/qrcode/" + timeNew + ".jpg";
+            //生成二维码
+            QRCodeUtil.encode(text, imgPath, destPath, true);
+            // 解析二维码
+            String str = QRCodeUtil.decode(destPath);
+            // 打印出解析出的内容
+            System.out.println(str);
+            //上传二维码到c d n
+            File file = new File(destPath);
+            FileInputStream input = new FileInputStream(file);
+            MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
+            Map<String, String> qrCode = uploadDownload.qrCode(multipartFile);
+            log.info("上传到cdn服务 sQrcode_src="+qrCode.get("url")+"=== Show_src="+qrCode.get("url"));
+            MerchantQrcode merchantQrcode = new MerchantQrcode();
+            merchantQrcode.setUid(uid);
+            merchantQrcode.setMer_id(mer_id);
+            merchantQrcode.setCode_id("");
+            merchantQrcode.setQrcode_src(qrCode.get("url"));
+            merchantQrcode.setShow_src(qrCode.get("url"));
+            merchantQrcodeDao.insterMerchantQrcode(merchantQrcode);
+            deleteDir(new File("/Users/hanyuxing/qrcode"));
+            return true;
+        }catch (Exception e){
+            e.printStackTrace();
+            return false;
+        }
     }
 
 

merchant_service/src/main/java/com/bjtdba/merchant/service/impl/SystemConfigValueServiceImpl.java

@@ -116,15 +116,15 @@ public class SystemConfigValueServiceImpl implements SystemConfigValueService {
     public boolean updateShopBonusSetting(String mer_id,String value) {
         System.out.println("mer_id======"+mer_id);
         Integer mer_id1 = Integer.parseInt(mer_id);
-        String configValue = systemConfigValueDao.getConfigValueByMerId("shop_bonus_setting",mer_id1);
+        String configValue = systemConfigValueDao.getConfigValueByMerId("base_commission",mer_id1);
         int status = 0;
         if(configValue!=null){
-           systemConfigValueDao.updateConfigValueByMerId("shop_bonus_setting",mer_id1,value);
+           systemConfigValueDao.updateConfigValueByMerId("base_commission",mer_id1,value);
         }else{
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");//设置日期格式
             //添加进去
             SystemConfigValue rrxSystemConfigValue = new SystemConfigValue();
-            rrxSystemConfigValue.setConfigKey("shop_bonus_setting");
+            rrxSystemConfigValue.setConfigKey("base_commission");
             rrxSystemConfigValue.setValue(value);
             rrxSystemConfigValue.setCreateTime(new Date());
             rrxSystemConfigValue.setMerId(mer_id1);
@@ -135,8 +135,9 @@ public class SystemConfigValueServiceImpl implements SystemConfigValueService {
     }
 
     public String getShopBonusSetting(String mer_id) {
+
         System.out.println("mer_id======"+mer_id);
         Integer mer_id1 = Integer.parseInt(mer_id);
-        return systemConfigValueDao.getConfigValueByMerId("shop_bonus_setting",mer_id1);
+        return systemConfigValueDao.getConfigValueByMerId("base_commission",mer_id1);
     }
 }

merchant_service/src/main/resources/application-dev.yml

@@ -2,9 +2,13 @@
   port: 8005
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yihucha?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
+#    url: jdbc:mysql://8.141.0.149:3307/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
+#    driver-class-name: com.mysql.jdbc.Driver
+#    password: Bjtdba.com
+#    username: root
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16
@@ -25,7 +29,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册
 
@@ -35,9 +39,9 @@ logging:
 
 
 #汇付回调地址
-huifu.urlWx: http://test.bjtdba.com/huifu_service/huifuService/huifuWx
-huifu.urlWx2: https://test.bjtdba.com/huifu_service/huifuService/huifuWx2
-huifu.urlAli: https://test.bjtdba.com/huifu_service/huifuService/huifuAli
+huifu.urlWx: https://testapi.hxxfb.com/huifu_service/huifuService/huifuWx
+huifu.urlWx2: https://testapi.hxxfb.com/huifu_service/huifuService/huifuWx2
+huifu.urlAli: https://testapi.hxxfb.com/huifu_service/huifuService/huifuAli
 
 #线下支付地址
-zhifu.url: https://offlinepay-test.bjtdba.com?mer_id=
+zhifu.url: https://testofflinepay.hxxfb.com?mer_id=

merchant_service/src/main/resources/application-pro.yml

@@ -2,9 +2,13 @@
   port: 8005
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
+#    url: jdbc:mysql://8.141.0.149:3307/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
+#    driver-class-name: com.mysql.jdbc.Driver
+#    password: Bjtdba.com
+#    username: root
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&characterEncoding=UTF-8
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16
@@ -25,7 +29,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册
 
@@ -35,9 +39,9 @@ logging:
 
 
 #汇付回调地址
-huifu.urlWx: http://test.bjtdba.com/huifu_service/huifuService/huifuWx
-huifu.urlWx2: https://test.bjtdba.com/huifu_service/huifuService/huifuWx2
-huifu.urlAli: https://test.bjtdba.com/huifu_service/huifuService/huifuAli
+huifu.urlWx: https://api.hxxfb.com/huifu_service/huifuService/huifuWx
+huifu.urlWx2: https://api.hxxfb.com/huifu_service/huifuService/huifuWx2
+huifu.urlAli: https://api.hxxfb.com/huifu_service/huifuService/huifuAli
 
 #线下支付地址
-zhifu.url: https://offlinepay-test.bjtdba.com?mer_id=
+zhifu.url: https://offlinepay.hxxfb.com?mer_id=

merchant_service/src/main/resources/mapper/MerchantMemberMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.bjtdba.merchant.dao.MerchantMemberDao">
 
     <insert id="insterMerchantMember">
-        INSERT INTO rrx_merchant_member (`mer_id`, `type`, `member_id`) VALUES (#{mer_id}, #{type}, #{member_id});
+        INSERT INTO rrx_merchant_member (`mer_id`, `type`, `member_id`,`settle_account_id`) VALUES (#{mer_id}, #{type}, #{member_id},#{settle_account_id});
     </insert>
 
 </mapper>

merchant_service/src/main/resources/mapper/OrderMerchantMapper.xml

@@ -6,6 +6,10 @@
         select IFNULL(sum(money-service_money-pension-swipe_fee),0) belowTheLine,count(id) belowTheLineNumber from rrx_order_merchant where status = 1 and mer_id = #{mer_id} and create_time  between #{start_time} and date_add(#{end_time},interval 1 day)
     </select>
 
+    <select id="belowTheLineNumber" resultType="java.lang.Integer">
+       select count(1) from (select  IFNULL(count(id),0) belowTheLineNumber from rrx_order_merchant where status = 1 and mer_id = #{mer_id} and create_time  between #{start_time} and date_add(#{end_time},interval 1 day) group by pay_user_id) as aa
+    </select>
+
     <select id="belowTheLineList" resultType="com.bjtdba.merchant.dto.PayUser">
         SELECT COALESCE(b.avatar, a.avatar) as avatar, COALESCE( b.account, '') as account, COALESCE(b.nickname, a.nickname) as nickname, a.money AS type, a.create_time
         FROM rrx_order_merchant a LEFT JOIN rrx_user b ON a.uid = b.uid
@@ -13,5 +17,13 @@
     </select>
 
 
+    <select id="jingdouSum" resultType="java.lang.String">
+        SELECT IFNULL(sum(number),0) from rrx_user_sign_jingdou where `status`!=0 and mer_id= #{mer_id} and  addtime   between #{start_time} and #{end_time}
+    </select>
+
+    <select id="gongxianSum" resultType="java.lang.String">
+        SELECT IFNULL(sum(number),0) from rrx_user_sign_gongxian where `status`!=0 and mer_id= #{mer_id} and  addtime   between #{start_time} and #{end_time}
+    </select>
+
 
 </mapper>

order_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 8004
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yihucha?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 200
@@ -13,7 +13,7 @@ spring:
 #日志格式化  只输出日期和内容
 
   redis:
-    host: 10.30.0.46
+    host: 60.205.129.253
     port: 6379
     password: bjtdba
     database: 0
@@ -41,7 +41,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册
 

order_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 8004
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 200
@@ -13,7 +13,7 @@ spring:
 #日志格式化  只输出日期和内容
 
   redis:
-    host: 10.30.0.46
+    host: 123.56.214.150
     port: 6379
     password: bjtdba
     database: 6
@@ -41,7 +41,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册
 

order_service/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: order-service
   profiles:
-    active: pro
+    active: dev
   cache:
     type: caffeine
     caffeine:

pension_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 8002
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yihucha?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16
@@ -22,7 +22,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册
 

pension_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 8002
 spring:
   datasource:
-    url: jdbc:mysql://10.28.5.46:13306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16
@@ -22,7 +22,7 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册
 

pension_service/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: pension-service  #服务 名称
   profiles:
-    active: pro
+    active: dev
   cache:
     type: caffeine
     caffeine:

poster_service/src/main/java/com/bjtdba/poster/service/Impl/PosterServiceImpl.java

@@ -86,7 +86,7 @@ public class PosterServiceImpl implements PosterService {
             //poster.setNameX(Integer.parseInt(qr_coordinateList[0]));//名字在海报的什么位置
             poster.setNameY(Integer.parseInt(qr_coordinateList[1]));
             //头像定位
-            poster.setPortraitCodeUrl(user.getAvatar()!=null?user.getAvatar():"https://app.bjtdba.com/uploads/logo.jpg");
+            poster.setPortraitCodeUrl(user.getAvatar()!=null?user.getAvatar():"https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png");
             String[] head_coordinateList = spli(sharePosters.getHead_coordinate());
             poster.setPortraitCodeX(Integer.parseInt(head_coordinateList[0]));
             poster.setPortraitCodeY(Integer.parseInt(head_coordinateList[1]));
@@ -108,21 +108,21 @@ public class PosterServiceImpl implements PosterService {
         poster.setHeight(995);
         //去php获取二维码
 //        String qrCodeUrl=HttpUtil.doGet("https://test.bjtdba.com/api/invite_code?uid="+uid+"&imgId="+imgId,"");
-        String qrCodeUrl=HttpUtil.doGet(phpPath+"/api/invite_code?uid="+uid+"&imgId="+imgId,"");
-        log.info("去php获取二维码,请求地址"+phpPath+"/api/invite_code?uid="+uid+"&imgId="+imgId+"qrCodeUrl="+qrCodeUrl);
-        if(qrCodeUrl.equals("")){
-            return ResponseUtil.fail("生成失败，请稍后再试");
-        }
-//        String qrCodeUrl = null;
-//        SystemAttachment systemAttachment = systemAttachmentDao.selectAttachmentSrcByIdUidAndCategoryId(Integer.parseInt(uid),8,null);
-//        if(systemAttachment!=null){
-//            //二维码
-//            qrCodeUrl = systemAttachment.getAttachment_src(); //二维码
-//        }else{
-//            //新建分享二维码
-//            String text = "https://test.bjtdba.com/share?spread="+uid;
-//            qrCodeUrl = qrCodeService.insterQrCode(Integer.parseInt(uid), text);
+//        String qrCodeUrl=HttpUtil.doGet(phpPath+"/api/invite_code?uid="+uid+"&imgId="+imgId,"");
+//        log.info("去php获取二维码,请求地址"+phpPath+"/api/invite_code?uid="+uid+"&imgId="+imgId+"qrCodeUrl="+qrCodeUrl);
+//        if(qrCodeUrl.equals("")){
+//            return ResponseUtil.fail("生成失败，请稍后再试");
 //        }
+        String qrCodeUrl = null;
+//        SystemAttachment systemAttachment = systemAttachmentDao.selectAttachmentSrcByIdUidAndCategoryId(Integer.parseInt(uid),8,null,null);
+        if(systemAttachment1!=null){
+            //二维码
+            qrCodeUrl = systemAttachment1.getAttachment_src(); //二维码
+        }else{
+            //新建分享二维码
+            String text = "https://api.hxxfb.com/share?spread="+uid;
+            qrCodeUrl = qrCodeService.insterQrCode(Integer.parseInt(uid), text);
+        }
         poster.setQrCodeUrl(qrCodeUrl);
         String[] qr_coordinateList = spli(sharePosters.getQr_coordinate());
         poster.setQrCodeX(Integer.parseInt(qr_coordinateList[0]));

poster_service/src/main/java/com/bjtdba/poster/service/Impl/QrCodeServiceImpl.java

@@ -41,6 +41,10 @@ public class QrCodeServiceImpl implements QrCodeService {
         File directory = new File("classes");
         String reportPath = directory.getCanonicalPath();
         String resource =reportPath + "/file/20221025172815531.png";
+
+
+
+//        String resource ="https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png";
         System.out.println("-----------------二维码----------------------------"+resource);
         //生成二维码
         QRCodeUtil.encode(text, resource, destPath, true);
@@ -56,6 +60,7 @@ public class QrCodeServiceImpl implements QrCodeService {
         MultipartFile multipartFile = new MockMultipartFile("file", file.getName(), "text/plain", IOUtils.toByteArray(input));
         Map<String, String> qrCode = uploadDownload.qrCode(multipartFile);
         String url = qrCode.get("url");
+
         System.out.println("-----------------二维码s----------------------------"+url);
         //deleteDir(new File("/Users/hanyuxing/qrcode"));
         //将邀请二维码添加到 rrx_system_attachment

poster_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 8008
 spring:
   datasource:
-    url: jdbc:mysql://8.141.0.149:3307/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: Bjtdba.com
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16
@@ -36,4 +36,4 @@ eureka:
   instance:
     prefer-ip-address: true #使用ip地址注册
 
-phpPath: https://api.gdjbp.com
+phpPath: https://testapi.hxxfb.com

poster_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 8008
 spring:
   datasource:
-    url: jdbc:mysql://8.141.0.149:3307/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: Bjtdba.com
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16
@@ -36,4 +36,4 @@ eureka:
   instance:
     prefer-ip-address: true #使用ip地址注册
 
-phpPath: https://api.gdjbp.com
+phpPath: https://api.hxxfb.com

sysmanage_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 7000
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yihucha?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16
@@ -32,6 +32,6 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册

sysmanage_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 7000
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16
@@ -32,6 +32,6 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册

system_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 8006
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yihucha?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16
@@ -12,10 +12,10 @@ spring:
       idle-timeout: 10000
 
   redis:
-    host: 10.30.0.46
+    host: 60.205.129.253
     port: 6379
     password: bjtdba
-    database: 0
+    database: 6
     timeout: 5000
     jedis:
       pool:
@@ -47,10 +47,13 @@ mybatis:
   ## mapper配置文件地址
   mapper-locations: classpath*:/mapper/*.xml
 
+
+
 #配置eureka
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
+
   instance:
     prefer-ip-address: true #使用ip地址注册

system_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 8006
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16
@@ -12,7 +12,7 @@ spring:
       idle-timeout: 10000
 
   redis:
-    host: 10.30.0.46
+    host: 123.56.214.150
     port: 6379
     password: bjtdba
     database: 6
@@ -51,6 +51,6 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册

system_service/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: system-service
   profiles:
-    active: pro
+    active: dev
   cache:
     type: caffeine
     caffeine:

thirdPartyWares_service/src/main/java/com/bjtdba/thirdPartWares/service/impl/TaobaoServiceImpl.java

@@ -88,8 +88,13 @@ public class TaobaoServiceImpl implements TaobaoService {
             BigDecimal decimal = new BigDecimal(str);
             BigDecimal pv=null;//新增pv值  pv=佣金*50%
             BigDecimal yanglaojin=null; //养老金=pv
-            pv=thirdPartyGoodsList.get(i).getPension().multiply(BigDecimal.valueOf(0.5)).setScale(2,BigDecimal.ROUND_HALF_UP);//四舍五入
-            yanglaojin=pv;//四舍五入
+
+            String valueStr=systemConfigValueDao.selectConfigValueByKey("sanfangfenpei");
+            JSONObject jsonObjectValue= JSONObject.parseObject(valueStr);
+            BigDecimal fenPV=new BigDecimal(jsonObjectValue.get("pv")+"");
+            BigDecimal fenyanglaojin=new BigDecimal(jsonObjectValue.get("yanglaojin")+"");
+            pv=thirdPartyGoodsList.get(i).getPension().multiply(fenPV).setScale(2,BigDecimal.ROUND_HALF_UP);//四舍五入
+            yanglaojin=thirdPartyGoodsList.get(i).getPension().multiply(fenyanglaojin).setScale(2,BigDecimal.ROUND_HALF_UP);//四舍五入;//四舍五入
 
             String trimmedValue = decimal.toPlainString();
 //            pv=trimmedValue.toString();
@@ -321,12 +326,19 @@ public class TaobaoServiceImpl implements TaobaoService {
         BigDecimal yanglaojin=null; //养老金=pv
         BigDecimal yongjin_obj=new BigDecimal(yongjin).setScale(2,BigDecimal.ROUND_HALF_UP);
 //        BigDecimal yongjin_bb=yongjin_obj.setScale(2,BigDecimal.ROUND_HALF_UP);
-        pv=yongjin_obj.multiply(BigDecimal.valueOf(0.5)).setScale(2,BigDecimal.ROUND_HALF_UP);//四舍五入
-        yanglaojin=pv;//四舍五入
+//        pv=yongjin_obj.multiply(BigDecimal.valueOf(0.5)).setScale(2,BigDecimal.ROUND_HALF_UP);//四舍五入
+//        yanglaojin=pv;//四舍五入
+        String valueStr=systemConfigValueDao.selectConfigValueByKey("sanfangfenpei");
+        JSONObject jsonObjectValue= JSONObject.parseObject(valueStr);
+        BigDecimal fenPV=new BigDecimal(jsonObjectValue.get("pv")+"");
+        BigDecimal fenyanglaojin=new BigDecimal(jsonObjectValue.get("yanglaojin")+"");
+        pv=yongjin_obj.multiply(fenPV).setScale(2,BigDecimal.ROUND_HALF_UP);//四舍五入
+        yanglaojin=yongjin_obj.multiply(fenyanglaojin).setScale(2,BigDecimal.ROUND_HALF_UP);//四舍五入;//四舍五入
 
         waresDetail.setYanglao(yanglaojin);
         waresDetail.setGongxian(pv);
         waresDetail.setJifen(pv);
+        waresDetail.setPv(pv);
         log.info("=================jsonObjects============="+data.toString());
 
 

thirdPartyWares_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 8007
 spring:
   datasource:
-    url: jdbc:mysql://8.141.0.149:3307/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
     driver-class-name: com.mysql.jdbc.Driver
-    password: Bjtdba.com
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16

thirdPartyWares_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 8007
 spring:
   datasource:
-    url: jdbc:mysql://8.141.0.149:3307/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
     driver-class-name: com.mysql.jdbc.Driver
-    password: Bjtdba.com
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16

userCenter_service/src/main/java/com/bjtdba/userCenter/service/impl/UserLogOnServiceImpl.java

@@ -119,11 +119,11 @@ public class UserLogOnServiceImpl implements UserLogOnService {
                 System.out.println("statusCode==="+statusCode);
                 SmsRecord smsRecord=new SmsRecord();
                 smsRecord.setPhone(phone);
-                smsRecord.setContent("【储蓄保】您的验证码为："+mobile_code+"，请勿泄露于他人！");
+                smsRecord.setContent("【幸福保】您的验证码为："+mobile_code+"，请勿泄露于他人！");
                 smsRecord.setCreateTime(new Date());
-                smsRecord.setTemplate("SMS_247420027");
+                smsRecord.setTemplate("SMS_311255692");
                 smsRecord.setResultcode(statusCode);
-                smsRecord.setUid("LTAI5tRfUFtmr5VFjqJ9D4dA");
+                smsRecord.setUid("LTAI5tKivJSckMYz5BHev3u8");
                 smsRecord.setRecordId(sendSmsResponse.getBody().getBizId());
                 try{
                     smsRecordDao.insterSms(smsRecord);
@@ -182,14 +182,15 @@ public class UserLogOnServiceImpl implements UserLogOnService {
             switch (type) {
                 //移动端手机号用户登录
                 case 0: {
-                    User user = selectUserByPhone(phone);
+                    User user = new User() ;
+                    user=selectUserByPhone(phone);
                     if (user != null) {
                         data.put("user", user);
                     } else {
-                        //没有该用户添加用户信息
-                        User userTo = new User();
-                        userTo.setPhone(phone);
-                        insterUser(userTo);
+//                        //没有该用户添加用户信息
+//                        User userTo = new User();
+//                        userTo.setPhone(phone);
+//                        insterUser(userTo);
                         user = selectUserByPhone(phone);
                         data.put("user", user);
                     }
@@ -221,7 +222,7 @@ public class UserLogOnServiceImpl implements UserLogOnService {
                         //没有该用户添加用户信息
                         User userInster = new User();
                         userInster.setPhone(phone);
-                        insterUser(userInster);
+//                        insterUser(userInster);
                         user = selectUserByPhone(phone);
 
                         data.put("user", user);
@@ -249,7 +250,7 @@ public class UserLogOnServiceImpl implements UserLogOnService {
                         //增加新用户   邀请用户绑定   spread_uid
                         user.setPhone(phone);
                         user.setWechat_user_id(wechat_user_id);
-                        insterUser(user);
+//                        insterUser(user);
                         //绑定线下消费记录积分
                         //unionUsersService.getAllNotBind(wechat_user_id,phone);
                         /**
@@ -326,13 +327,14 @@ public class UserLogOnServiceImpl implements UserLogOnService {
      * @return
      */
     private int insterUser(User user) throws UnknownHostException {
+
         //User user = new User();
         //String s = BCrypt.with(BCrypt.Version.VERSION_2Y).hashToString(10, "123456".toCharArray());//加密
         //BCrypt.Result result = BCrypt.verifyer().verify("123456".toCharArray(), s);//解密
         user.setAccount(user.getPhone());
         user.setPwd(BCrypt.with(BCrypt.Version.VERSION_2Y).hashToString(10, "123456".toCharArray()));//默认密码123456
         user.setNickname("用户"+user.getPhone().substring(7));
-        user.setAvatar("https://app.bjtdba.com/uploads/logo.jpg");
+        user.setAvatar("https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png");
         //user.setPhone(phone);
         user.setLast_ip(InetAddress.getLocalHost().getHostAddress());
         user.setIdentity(5);//推广员

userCenter_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 8003
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yihucha?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16
@@ -12,10 +12,10 @@ spring:
       idle-timeout: 10000
 
   redis:
-    host: 10.30.0.46
+    host:  60.205.129.253
     port: 6379
     password: bjtdba
-    database: 0
+    database: 6
     timeout: 5000
     jedis:
       pool:

userCenter_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 8003
 spring:
   datasource:
-    url: jdbc:mysql://8.141.0.149:3307/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=UTF-8
     driver-class-name: com.mysql.jdbc.Driver
-    password: Bjtdba.com
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16
@@ -12,7 +12,7 @@ spring:
       idle-timeout: 10000
 
   redis:
-    host: 8.141.0.149
+    host: 123.56.214.150
     port: 6379
     password: bjtdba
     database: 6

wares_service/src/main/resources/application-dev.yml

@@ -2,9 +2,9 @@
   port: 8001
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yihucha?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://60.205.129.253:3306/test_yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: Rhhx888888.
     username: root
     hikari:
       maximum-pool-size: 16
@@ -32,6 +32,6 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册

wares_service/src/main/resources/application-pro.yml

@@ -2,9 +2,9 @@
   port: 8001
 spring:
   datasource:
-    url: jdbc:mysql://10.30.0.49:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
+    url: jdbc:mysql://123.56.214.150:3306/yhc?autoReconnect=true&failOverReadOnly=false&serverTimezone=UTC&useSSL=false&allowPublicKeyRetrieval=true
     driver-class-name: com.mysql.jdbc.Driver
-    password: 1&0Y2w#N
+    password: P7pjJ2d6R1FdBMmz
     username: root
     hikari:
       maximum-pool-size: 16
@@ -32,6 +32,6 @@ mybatis:
 eureka:
   client:
     service-url:
-      defaultZone: http://20.100.5.100:8000/eureka/
+      defaultZone: http://127.0.0.1:8000/eureka/
   instance:
     prefer-ip-address: true #使用ip地址注册

wares_service/src/main/resources/application.yml

@@ -2,7 +2,7 @@ spring:
   application:
     name: wares-service
   profiles:
-    active: pro
+    active: dev
   cache:
     type: caffeine
     caffeine:

wares_service/src/main/resources/mapper/MerchantMapper.xml

@@ -69,7 +69,7 @@
         FROM rrx_merchant as s
         left JOIN rrx_merchant_intention as mi on  mi.mer_id=s.mer_id
         <where>
-            s.status = 1 and s.mer_state = 1 and s.is_del = 0 and mi.status = 1
+            s.status = 1 and s.mer_state = 1 and s.is_del = 0 and mi.status = 1 and s.mer_id!=496 and s.mer_id!=439 and s.mer_id!=491
 
             <if test="null !=uid">
                 and s.uid != #{uid}