前进前进，继续上代码

soss-admin/src/main/java/com/soss/web/controller/coffee/WeixinController.java

@@ -113,6 +113,11 @@ public class WeixinController {
         return weixinService.refundNotify(xmlData);
 
     }
-
+@Autowired
+private SendSmsUtil sendSmsUtil;
+    @RequestMapping("/test")
+    public void test(){
+        sendSmsUtil.sendSms("15726637040","SMS_243650242",null);
+    }
 
 }

soss-system/src/main/java/com/soss/system/service/impl/GoodsServiceImpl.java

@@ -281,7 +281,6 @@ public class GoodsServiceImpl implements IGoodsService
         int i = goodsMapper.updateGoods(goods);
         if(boo&&i>0){
             Shop shop = new Shop();
-            shop.setIsDefault(0L);
             List<Shop> shops = shopService.selectShopList(shop);
             for (Shop shop1 : shops) {
                 if(!"3".equals(shop1.getState())){

soss-system/src/main/java/com/soss/system/service/impl/OrderServiceImpl.java

@@ -478,7 +478,7 @@ public class OrderServiceImpl implements IOrderService
 
     public  List<JSONObject>  getOrderInfo(String machineCode) {
         Machine machine = machineMapper.selectMachineByCode(machineCode);
-        List<String> status = Arrays.asList("2","4","5");
+        List<String> status = Arrays.asList("2","3","4");
         List<Order> orders = orderMapper.selectOrder(status, machine.getId());
         Map<String, List<Order>> collect = orders.stream().collect(Collectors.groupingBy(Order::getState));
         List<JSONObject> objects = new ArrayList<>();

soss-system/src/main/resources/mapper/system/OrderMapper.xml

@@ -142,12 +142,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="shopId !=null">
             and o.shop_id=#{shopId}
         </if>
-        and o.state not in ('1', '8', '9', '10', '11')) a
+        and o.state  in ('6','7','12','13','14','15')) a
     </select>
     <select id="selectSalesAmount" resultType="java.math.BigDecimal">
-        select SUM(o.amount)   from `order` o
-        where  shop_id =#{shopId}
-        and state not in ('1','8','9','10','11')
+        select
+        (
+        select
+        SUM(o.amount)
+        from
+        `order` o
+        where
+         o.shop_id =#{shopId} and
+        state in ('6', '7', '12', '13', '14'))-(
+        select
+        SUM(or2.refund_amount)
+        from
+        order_refund or2
+        where
+        or2 .order_id in (
+        select
+        id
+        from
+        `order` o
+        where
+        o.shop_id =#{shopId} and
+        o.state = '14'))
+        from
+        dual
     </select>
     <select id="selectByUserId" resultMap="OrderResult">
         <include refid="selectOrderVo"/>
@@ -246,7 +267,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="selectBeforeOrder" resultType="com.soss.system.domain.Order">
         select id, order_no, order_num, user_id, user_name, user_phone, pay_time, finish_time, amount, goods_num, pick_code, shop_id, machine_id, source, state, created_at, updated_at
-        from `order` o where o.id &lt;#{orderId} and o.shop_id =(select DISTINCT a.shop_id  from `order` a where a.id=#{orderId})
+        from `order` o where o.id &lt;=#{orderId} and o.shop_id =(select DISTINCT a.shop_id  from `order` a where a.id=#{orderId})
 
         and state in
         <foreach item="item" index="index" collection="status"

soss-system/src/main/resources/mapper/system/SpecMapper.xml

@@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="isNeccessary != null and isNeccessary != ''">is_neccessary = #{isNeccessary},</if>
             <if test="updatedAt != null">updated_at = #{updatedAt},</if>
             <if test="code != null">code = #{code},</if>
-            <if test="remark != null">code = #{remark},</if>
+            <if test="remark != null">remark = #{remark},</if>
         </trim>
         where id = #{id}
     </update>