Merge remote-tracking branch 'origin/dev' into dev

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/feign/OrderFeign.java

@@ -17,7 +17,7 @@ import java.util.Set;
 /**
  * Created by ace on 2017/9/15.
  */
-@FeignClient(name = "order")
+@FeignClient(name = "xx-order")
 public interface OrderFeign {
     @GetMapping("/baseOrder/count")
     public ObjectRestResponse<Integer> baseOrderCount(@RequestParam("hasMemberRight") Integer hasMemberRight,@RequestParam("multiStatus") String multiStatus, @RequestParam("userId") Integer userId);

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -163,6 +163,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @ApiOperation("查询个数")
     @RequestMapping(value = "/count",method = RequestMethod.GET)
     @ResponseBody
+    @IgnoreUserToken
     public ObjectRestResponse<Integer> entityList(Integer hasMemberRight, String multiStatus, Integer userId){
         //查询列表数据
         WeekendSqls<BaseOrder> weekendSqls = WeekendSqls.<BaseOrder>custom();

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -17,12 +17,11 @@
 
     <select id="monthOrderTotal" resultType="com.xxfc.platform.order.entity.OrderStatistics">
         SELECT
-
         IFNULL(sum(gmv),0) as totalGmv
         FROM
         daily_members_order_statistics
         WHERE
-        branch_company_id =1
+        branch_company_id =#{companyId}
         and
         DATE_FORMAT(one_day,'%Y-%c')=DATE_FORMAT(DATE_SUB(NOW(),INTERVAL 1 DAY),'%Y-%c')
     </select>