商户查询调整

gateWay_server/src/main/java/com/bjtdba/gateWay/filter/ApiRequestFilter.java

@@ -120,7 +120,7 @@ public class ApiRequestFilter implements GlobalFilter, Ordered {
             if(token!=null&&!token.equals("")) {
                 if (!redisUtil.hasKey("java_" + token)) {
                     log.info("用户token过期,token =="+token);
-                    return unauthorized(exchange, 400, "用户token过期");
+                    return unauthorized(exchange, 40000, "用户token过期");
                 }
                 String uid = redisUtil.get("java_" + token).toString();
 //                log.info("uid = {}",uid);

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

@@ -75,6 +75,7 @@ public class MerchantSettleInController {
     @PostMapping("/addressList")
     public Object addressList(@RequestBody Map<String,String> map){
         return merchantSettleInService.selectAddressList(Integer.parseInt(map.get("id")),map.get("code"));
+
     }
     /**
      * 图片上传

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

@@ -17,6 +17,6 @@ public interface OrderMerchantDao {
     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);
+    String gongxianSum(int mer_id,  String start_time, String end_time);
 
 }

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

@@ -5,9 +5,11 @@ import org.apache.ibatis.annotations.Mapper;
 import org.springframework.stereotype.Repository;
 
 import java.util.List;
+import java.util.Map;
 
 @Repository
 @Mapper
 public interface UserAreaDao {
     List<Address> selectAddressList(String code);
+    Map<String, String> selectAreaById(Integer area_id);
 }

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

@@ -155,7 +155,7 @@ public class MerchantCashierServiceImpl implements MerchantCashierService {
             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);
+            String gongxianSumsum=orderMerchantDao.gongxianSum(mer_id,start_time,end_time);
 
 
             Long a = orderLineOrderSun.get("orderLineNumber");

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

@@ -514,8 +514,12 @@ public class MerchantSettleInServiceImpl implements MerchantSettleInService {
         merchant.setStreet_id(merchantIntention.getStreet_id());
         //经纬度需要查库
         Map<String,String> map = userStreetDao.selectStreetById(merchantIntention.getStreet_id());
+        if(map==null){
+             map = userAreaDao.selectAreaById(merchantIntention.getArea_id());
+        }
         merchant.setLng(map.get("lng"));
         merchant.setLat(map.get("lat"));
+
         merchant.setType(merchantIntention.getType());//个人还是企业
         merchant.setEmail(merchantIntention.getEmail());//邮箱
         merchant.setOpen_account(merchantIntention.getOpen_account());//开户许可证
@@ -638,6 +642,13 @@ public class MerchantSettleInServiceImpl implements MerchantSettleInService {
             addressList = userAreaDao.selectAddressList(code);
         }else if(id == 4){
             addressList = userStreetDao.selectStreetList(code);
+            if(addressList==null||addressList.size()==0){
+                Address moren=new Address();
+                moren.setCode("0000000000");
+                moren.setId("0000000000");
+                moren.setName("默认");
+                addressList.add(moren);
+            }
         }
         return addressList;
     }

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

@@ -22,7 +22,10 @@
     </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 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 IFNULL(sum(available),0) from rrx_order_merchant where status = 1 and  paid = 1 and mer_id = #{mer_id}   and  create_time    between #{start_time} and date_add(#{end_time},interval 1 day)
+
     </select>
 
 

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

@@ -6,4 +6,8 @@
         select rua.city_code as id,rua.area_code as code ,rua.area_name as name  from rrx_user_area rua where rua.city_code = #{code}
     </select>
 
+    <select id="selectAreaById" resultType="java.util.Map">
+        select rua.lng ,rua.lat from rrx_user_area rua where rua.area_code=#{area_code}
+    </select>
+
 </mapper>

wares_service/src/main/resources/application.yml

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

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

@@ -68,6 +68,7 @@
         SELECT s.*,(st_distance (point(s.lng,s.lat),point(#{lng},#{lat})) *111195) AS distance
         FROM rrx_merchant as s
         left JOIN rrx_merchant_intention as mi on  mi.mer_id=s.mer_id
+        RIGHT  JOIN rrx_store_product  as sp on sp.mer_id= s.mer_id
         <where>
             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
 
@@ -94,6 +95,7 @@
             <if test="0 == distanceAsc and null != distanceAsc">
                 ORDER BY distance  asc
             </if>
+            GROUP BY s.mer_id
         </where>
     </select>
 </mapper>