修改小程序接口

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -7,7 +7,6 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.github.zuihou.base.R;
 import com.github.zuihou.business.barrel.entity.EquBarrel;
 import com.github.zuihou.business.barrel.service.EquBarrelService;
-import com.github.zuihou.business.goods.entity.Goods;
 import com.github.zuihou.business.goods.service.GoodsService;
 import com.github.zuihou.business.member.entity.Member;
 import com.github.zuihou.business.miniApp.service.MiniAppService;
@@ -15,6 +14,7 @@ import com.github.zuihou.business.order.entity.Order;
 import com.github.zuihou.business.order.service.OrderService;
 import com.github.zuihou.business.productConfig.entity.ProductConfig;
 import com.github.zuihou.business.productConfig.service.ProductConfigService;
+import com.github.zuihou.business.productionresource.dto.EquGoodsDto;
 import com.github.zuihou.business.productionresource.entity.ProductionResource;
 import com.github.zuihou.business.productionresource.service.ProductionTenantResourceService;
 import com.github.zuihou.business.spe.entity.Spe;
@@ -85,14 +85,22 @@ public class AndroidApi {
     private ProductionTenantResourceService productionTenantResourceService;
 
 
+//    @ApiOperation("获取商品列表")
+//    @PostMapping({"/goodsList"})
+//    public R<List<Goods>> goodsList(@RequestBody Map<String, Object> params) {
+//        BaseContextHandler.setTenant("0000");
+//        long equId = (Long) params.get("equId");
+//        long comId = (Long) params.get("comId");
+//        List<Goods> list = goodsService.getEquGoods(equId);
+//        return R.success(list);
+//    }
+
     @ApiOperation("获取商品列表")
-    @PostMapping({"/goodsList"})
-    public R<List<Goods>> goodsList(@RequestBody Map<String, Object> params) {
+    @GetMapping({"/goodsList"})
+    public R<List<EquGoodsDto>> goodsList(@RequestParam(name = "equId",required = true) Long equId) {
         BaseContextHandler.setTenant("0000");
-        long equId = (Long) params.get("equId");
-        long comId = (Long) params.get("comId");
-        List<Goods> list = goodsService.getEquGoods(equId);
-        return R.success(list);
+        List<EquGoodsDto> equGoods = productionTenantResourceService.getEquGoods(equId);
+        return R.success(equGoods);
     }
 
 
@@ -103,9 +111,6 @@ public class AndroidApi {
         String token = "";
         long speId = param.get("speId");
         long equId = param.get("equId");
-//        long equId = param.get("equId");
-//        根据规格ID查询goodsId
-
         Spe spe = speService.getById(speId);
 
 //        生成本地订单
@@ -153,16 +158,14 @@ public class AndroidApi {
 
 //    订单查询接口
 
-    @ApiOperation("订单查询接口")
-    @PostMapping({"/getOrder"})
-    public R<Map<Object, Object>> getOrder(@RequestBody Map<String, Long> param) {
+    @ApiOperation("订单状态查询接口")
+    @GetMapping({"/getOrder"})
+    public R<Map<Object, Object>> getOrder(@RequestParam(name = "orderId" ,required = true) Long orderId) {
         BaseContextHandler.setTenant("0000");
         HashMap<Object, Object> resultMap = new HashMap<>();
-        long orderId = param.get("orderId");
         Order order = orderService.getById(orderId);
-        Order order111 = orderService.getOrder(orderId);
         String orderStatus = order.getOrderStatus();
-        if ("SUCCESS".equals(orderStatus)) {
+        if ("1" == orderStatus) {
             ProductConfig productConfig = productConfigService.getProdCfg(order.getOrderSpecs());
             resultMap.put("productConfig", productConfig);
         }
@@ -176,9 +179,8 @@ public class AndroidApi {
 
     @ApiOperation("料筒查询接口")
     @PostMapping({"/getBarrelList"})
-    public R<List<EquBarrel>> getBarrelList(@RequestBody Map<String, Long> param) {
+    public R<List<EquBarrel>> getBarrelList(@RequestParam(name="equId",required = true) Long equId) {
         BaseContextHandler.setTenant("0000");
-        long equId = (Long) param.get("equId");
         HashMap<String, Object> paramMap = new HashMap<>();
         paramMap.put("equId", equId);
         List<EquBarrel> barrelList = barrelService.listByMap(paramMap);
@@ -361,8 +363,11 @@ public class AndroidApi {
      *
      * @return
      */
-    @GetMapping("/boundEqu")
-    public R<Boolean> boundEqu(String equId, String isBound) {
+    @PostMapping("/boundEqu")
+    public R<Boolean> boundEqu(@RequestBody Map<String, String> map) {
+        String equId = map.get("equId");
+        String isBound = map.get("isBound");
+
         UpdateWrapper<ProductionResource> updateWrapper = new UpdateWrapper<>();
         updateWrapper.set("is_bound", isBound);
         updateWrapper.eq("id", equId);

imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/MiniApp.java

@@ -7,6 +7,8 @@ import com.github.zuihou.business.member.entity.Member;
 import com.github.zuihou.business.member.service.MemberService;
 import com.github.zuihou.business.order.entity.Order;
 import com.github.zuihou.business.order.service.OrderService;
+import com.github.zuihou.business.productionresource.entity.ProductionResource;
+import com.github.zuihou.business.productionresource.service.ProductionTenantResourceService;
 import com.github.zuihou.business.spe.service.SpeService;
 import com.github.zuihou.business.wxpay.AmountDto;
 import com.github.zuihou.business.wxpay.PayerDto;
@@ -15,8 +17,6 @@ import com.github.zuihou.cfg.WxPayCfg;
 import com.github.zuihou.context.BaseContextHandler;
 import com.github.zuihou.database.mybatis.conditions.query.QueryWrap;
 import com.github.zuihou.service.WxPayService;
-import com.github.zuihou.tenant.entity.Productionresource;
-import com.github.zuihou.tenant.service.ProductionresourceService;
 import com.github.zuihou.utils.WxPayUtil;
 import com.wechat.pay.contrib.apache.httpclient.auth.Verifier;
 import io.swagger.annotations.ApiOperation;
@@ -49,8 +49,10 @@ public class MiniApp {
     @Autowired
     private WxPayService wxPayService;
 
+    //    @Autowired
+//    private ProductionresourceService productionresourceService;
     @Autowired
-    private ProductionresourceService productionresourceService;
+    ProductionTenantResourceService productionTenantResourceService;
 
 
     @GetMapping("/testGet")
@@ -155,16 +157,15 @@ public class MiniApp {
 
     //设备列表
     @PostMapping("/getEqu")
-    public R<List<Productionresource>> getEqu(@RequestBody Map<String, Double> address) {
+    public R<List<ProductionResource>> getEqu(@RequestBody Map<String, Double> address) {
         BaseContextHandler.setTenant("0000");
-        Double lng = address.get("lng");
-        Double lat = address.get("lat");
-        List<Productionresource> productionresourceList = productionresourceService.getProductionresourceList(null);
-        for (Productionresource p : productionresourceList
-        ) {
-            p.setPic("http://106.14.142.95:80/file/equPic.jpg");
-        }
-        return R.success(productionresourceList);
+//        暂时先不根据坐标取值,写死五个
+//        Double lng = address.get("lng");
+//        Double lat = address.get("lat");
+        QueryWrap<ProductionResource> queryWrap = new QueryWrap<>();
+        queryWrap.orderByDesc("create_time").last("limit 5");
+        List<ProductionResource> list = productionTenantResourceService.list(queryWrap);
+        return R.success(list);
     }
 
 
@@ -176,8 +177,9 @@ public class MiniApp {
         QueryWrap<Member> memberQueryWrap = new QueryWrap<>();
         memberQueryWrap.eq("member_openId", openId);
         Member member = memberService.getOne(memberQueryWrap);
-//        QueryWrap<Order> queryWrap = new QueryWrap<Order>().eq("order_member_id", member.getId()).orderByAsc("update_time").last("limit 3");
-//        List<Order> orderList = orderService.list(queryWrap);
+//        查询订单状态不是未支付的订单
+        QueryWrap<Order> orderQueryWrap = new QueryWrap<>();
+        orderQueryWrap.notIn("order_status", "0");
         List<Order> orderList = orderService.getOrderList(member.getId());
 
         return R.success(orderList);
@@ -192,8 +194,11 @@ public class MiniApp {
         return R.success(order);
     }
 
-
-    //    首页banaer
+    /**
+     * 首页banaer
+     *
+     * @return
+     */
     @GetMapping("/homeBanaer")
     public R<List<String>> homeBanaer() {
         BaseContextHandler.setTenant("0000");
@@ -204,5 +209,33 @@ public class MiniApp {
         return R.success(banaerList);
     }
 
+    /**
+     * @return 查询订单条数
+     */
+    @GetMapping("/getOrdersTotal")
+    public R<Integer> getOrdersTotal() {
+        QueryWrap<Order> orderQueryWrap = new QueryWrap<>();
+        orderQueryWrap.notIn("order_status", "0");
+        int count = orderService.count(orderQueryWrap);
+        return R.success(count);
+    }
+
+
+    /**
+     * @return 查询附近设备条数
+     */
+    @GetMapping("/getEquTotal")
+    public R<Integer> getEquTotal() {
+
+        QueryWrap<ProductionResource> queryWrap = new QueryWrap<>();
+        queryWrap.orderByDesc("create_time").last("limit 5");
+        List<ProductionResource> list = productionTenantResourceService.list(queryWrap);
+        if (null == list) {
+            return R.success(0);
+        }
+
+        return R.success(list.size());
+    }
+
 
 }

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/order/OrderMapper.xml

@@ -22,7 +22,8 @@
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id,orderMemberName, orderGoodsName,orderGoodsPic,orderSpecsName,deviceName,
+        id
+        ,orderMemberName, orderGoodsName,orderGoodsPic,orderSpecsName,deviceName,
         order_member_id, order_goods_id, order_company_id, order_specs, order_amount, order_unit_price, order_goods_amount, order_status, create_time, update_time, order_pay_time, order_end_time, order_close_time,org_id
     </sql>
 
@@ -31,7 +32,7 @@
         <include refid="Base_Column_List"/>
         from (
         select o.*, o.order_company_id as org_id, g.goods_name as orderGoodsName, g.goods_pic as orderGoodsPic,
-        s.spec_name  as orderSpecsName,  m.member_name as orderMemberName, p.name as deviceName
+        s.spec_name as orderSpecsName, m.member_name as orderMemberName, p.name as deviceName
         from bt_order o
         left join bt_goods g on o.order_goods_id = g.id
         left join bt_spe s on o.order_specs = s.id
@@ -67,6 +68,7 @@
                  left join bt_spe s on o.order_specs = s.id
                  left join bt_member m on o.order_member_id = m.id
         where o.order_member_id = #{memberId}
+          and o.order_status!="0"
 
 
     </select>
@@ -93,16 +95,16 @@
 
     </select>
     <select id="getOrderDetail" resultType="com.github.zuihou.business.order.dto.OrderDetailDto">
-        select o.id as orderId,
+        select o.id           as orderId,
                o.order_status as orderStatus,
-               o.create_time    as createTime,
-               s.spec_name      as specName,
-               s.spec_s_price   as sellPrice,
-               g.goods_name     as goodsName,
-               g.goods_pic      as goodsPic,
-               m.member_name    as memberName,
-               p.name           as equName,
-               r.label           as equComName
+               o.create_time  as createTime,
+               s.spec_name    as specName,
+               s.spec_s_price as sellPrice,
+               g.goods_name   as goodsName,
+               g.goods_pic    as goodsPic,
+               m.member_name  as memberName,
+               p.name         as equName,
+               r.label        as equComName
         from bt_order o
                  left join bt_spe s on o.order_specs = s.id
                  left join bt_goods g on s.id = goods_id
@@ -115,60 +117,60 @@
 
     <select id="getStatisticMap" parameterType="hashMap" resultType="java.util.Map">
         select sum(num1) as todayNum,
-               sum(num2) as exceptNum,
-               sum(num3) as errMsgNum,
-               sum(num4) as todayAmount,
-               sum(num5) as sevenAmount,
-               sum(num6) as sevenNum
+        sum(num2) as exceptNum,
+        sum(num3) as errMsgNum,
+        sum(num4) as todayAmount,
+        sum(num5) as sevenAmount,
+        sum(num6) as sevenNum
         from (
-                 select count(1) as num1 ,0 as num2,0 as num3,0 as num4,0 as num5,0 as num6 from bt_order o where 1=1
-                    <if test="now != null">
-                        and o.create_time >= #{now, jdbcType=TIMESTAMP}
-                    </if>
-                    <if test="nextDay != null">
-                        and o.create_time <![CDATA[ <= ]]> #{nextDay, jdbcType=TIMESTAMP}
-                    </if>
-                    <if test="id != null">
-                        and o.id = #{id}
-                    </if>
-                 union
-                 select 0 as num1, count(1) as num2 ,0 as num3,0 as num4,0 as num5,0 as num6 from bt_order o
-                 union
-                 select 0 as num1,0 as num2,count(1) as num3,0 as num4,0 as num5,0 as num6 from bt_order o
-                 union
-                 select 0 as num1,0 as num2,0 as num3,sum(o.order_amount) as num4,0 as num5,0 as num6 from  bt_order o where 1=1
-                    <if test="now != null">
-                        and o.create_time >= #{now, jdbcType=TIMESTAMP}
-                    </if>
-                    <if test="nextDay != null">
-                        and o.create_time <![CDATA[ <= ]]> #{sevenAgo, jdbcType=TIMESTAMP}
-                    </if>
-                    <if test="id != null">
-                        and o.id = #{id}
-                    </if>
-                 union
-                 select 0,0,0,0,count(1) as num5,0 from  bt_order o where 1=1
-                    <if test="sevenAgo != null">
-                        and o.create_time >= #{sevenAgo, jdbcType=TIMESTAMP}
-                    </if>
-                    <if test="now != null">
-                        and o.create_time <![CDATA[ <= ]]> #{now, jdbcType=TIMESTAMP}
-                    </if>
-                    <if test="id != null">
-                        and o.id = #{id}
-                    </if>
-                 union
-                 select 0,0,0,0,0,sum(o.order_amount) as num6 from  bt_order o where produce_status = '1'
-                    <if test="sevenAgo != null">
-                        and o.create_time >= #{sevenAgo, jdbcType=TIMESTAMP}
-                     </if>
-                    <if test="now != null">
-                     and o.create_time <![CDATA[ <= ]]> #{now, jdbcType=TIMESTAMP}
-                    </if>
-                    <if test="id != null">
-                     and o.id = #{id}
-                    </if>
-             ) f
+        select count(1) as num1 ,0 as num2,0 as num3,0 as num4,0 as num5,0 as num6 from bt_order o where 1=1
+        <if test="now != null">
+            and o.create_time >= #{now, jdbcType=TIMESTAMP}
+        </if>
+        <if test="nextDay != null">
+            and o.create_time <![CDATA[ <= ]]> #{nextDay, jdbcType=TIMESTAMP}
+        </if>
+        <if test="id != null">
+            and o.id = #{id}
+        </if>
+        union
+        select 0 as num1, count(1) as num2 ,0 as num3,0 as num4,0 as num5,0 as num6 from bt_order o
+        union
+        select 0 as num1,0 as num2,count(1) as num3,0 as num4,0 as num5,0 as num6 from bt_order o
+        union
+        select 0 as num1,0 as num2,0 as num3,sum(o.order_amount) as num4,0 as num5,0 as num6 from bt_order o where 1=1
+        <if test="now != null">
+            and o.create_time >= #{now, jdbcType=TIMESTAMP}
+        </if>
+        <if test="nextDay != null">
+            and o.create_time <![CDATA[ <= ]]> #{sevenAgo, jdbcType=TIMESTAMP}
+        </if>
+        <if test="id != null">
+            and o.id = #{id}
+        </if>
+        union
+        select 0,0,0,0,count(1) as num5,0 from bt_order o where 1=1
+        <if test="sevenAgo != null">
+            and o.create_time >= #{sevenAgo, jdbcType=TIMESTAMP}
+        </if>
+        <if test="now != null">
+            and o.create_time <![CDATA[ <= ]]> #{now, jdbcType=TIMESTAMP}
+        </if>
+        <if test="id != null">
+            and o.id = #{id}
+        </if>
+        union
+        select 0,0,0,0,0,sum(o.order_amount) as num6 from bt_order o where produce_status = '1'
+        <if test="sevenAgo != null">
+            and o.create_time >= #{sevenAgo, jdbcType=TIMESTAMP}
+        </if>
+        <if test="now != null">
+            and o.create_time <![CDATA[ <= ]]> #{now, jdbcType=TIMESTAMP}
+        </if>
+        <if test="id != null">
+            and o.id = #{id}
+        </if>
+        ) f
     </select>
 
 </mapper>

imcs-bt-be/imcs-business-biz/src/main/resources/mapper_business/base/productionresource/ProductionresourceMapper.xml

@@ -92,9 +92,11 @@
                eg.equ_id          as equId,
                eg.goods_id        as goodsId,
                eg.ud_status       as udStatus,
+               eg.is_starving     as isStarving,
                g.goods_cate_id    as goodsCateId,
                g.goods_name       as goodsName,
                g.goods_pic        as goodsPic,
+               g.goods_detail_pic as goodsDetailPic,
                g.goods_code       as goodsCode,
                g.goods_tag        as goodsTag,
                g.goods_unit       as goodsUnit,

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/barrel/dto/EquBarrelSaveDTO.java

@@ -113,4 +113,12 @@ public class EquBarrelSaveDTO implements Serializable {
     @Length(max = 10, message = "料筒编号")
     private String barrelCode;
 
+
+    /**
+     * 料筒类型
+     */
+    @ApiModelProperty(value = "料筒类型")
+    private String barrelType;
+
+
 }

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/barrel/entity/EquBarrel.java

@@ -46,6 +46,15 @@ public class EquBarrel extends Entity<Long> {
     @Excel(name = "料筒编号")
     private String barrelCode;
 
+    /**
+     * 料筒类型
+     */
+    @ApiModelProperty(value = "料筒类型")
+    @TableField("barrel_code")
+    @Excel(name = "料筒类型")
+    private String barrelType;
+
+
     /**
      * 设备id
      */

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/dto/EquGoodsDto.java

@@ -26,6 +26,7 @@ public class EquGoodsDto implements Serializable {
     private Long goodsId;
     private String goodsName;
     private String goodsPic;
+    private String goodsDetailPic;
     private String goodsCode;
     private String goodsUnit;
     private Long goodsCateId;
@@ -38,6 +39,10 @@ public class EquGoodsDto implements Serializable {
      * 上下架状态
      */
     private String udStatus;
+    /**
+     * 是否缺料  0缺料1正常
+     */
+    private String isStarving;
 
 
 }

imcs-bt-be/imcs-business-entity/src/main/java/com/github/zuihou/business/productionresource/entity/EquAndGoods.java

@@ -15,6 +15,9 @@ import lombok.experimental.Accessors;
 import java.time.LocalDateTime;
 import java.util.List;
 
+/**
+ * @author User
+ */
 @Data
 @NoArgsConstructor
 @ToString(callSuper = true)
@@ -57,6 +60,14 @@ public class EquAndGoods extends Entity<Long> {
     @Excel(name = "上下架状态")
     private String udStatus;
 
+    /**
+     * 是否缺料
+     */
+    @ApiModelProperty(value = "是否缺料")
+    @TableField("is_starving")
+    @Excel(name = "是否缺料")
+    private String isStarving;
+
     @ApiModelProperty(value = "商品")
     @TableField(exist = false)
     @Excel(name = "商品")