海博正式环境配置

yami-shop-api/src/main/resources/application-prod.yml

@@ -22,6 +22,6 @@ logging:
 
 hb:
   host: https://api-open.hiboos.com
-  appId: a4ab0376fde34b81a99335ff91adddf7
-  secret: ba167357df0a4e8dad4e3b62a2b54064
+  appId: 71ad2626c0124ca1a5c07cf5ca818c43
+  secret: f655f69f962f427db1f0436fd34cd998
 

yami-shop-bean/src/main/java/com/yami/shop/bean/enums/ReturnMoneyStsType.java

@@ -13,7 +13,7 @@ public enum ReturnMoneyStsType {
     PROCESSING(20),
 
     /**
-     * 买家已发货
+     * 买家已发货 :待退货（一审同意）
      */
     CONSIGNMENT(60),
 

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/hb/StoreManagementController.java

@@ -80,4 +80,14 @@ public class StoreManagementController {
         return R.SUCCESS(storeManagementService.detail(id));
     }
 
+
+    /**
+     * 更改门店经营状态
+     */
+    @PostMapping("/updateStatus")
+    public R status(@RequestBody JSONObject HBRequest) {
+        log.info("海博变更门店经营状态{}", HBRequest);
+        storeManagementService.updateStatus(HBRequest);
+        return R.SUCCESS();
+    }
 }

yami-shop-platform/src/main/resources/application-prod.yml

@@ -21,6 +21,6 @@ logging:
 
 hb:
   host: https://api-open.hiboos.com
-  appId: a4ab0376fde34b81a99335ff91adddf7
-  secret: ba167357df0a4e8dad4e3b62a2b54064
+  appId: 71ad2626c0124ca1a5c07cf5ca818c43
+  secret: f655f69f962f427db1f0436fd34cd998
 

yami-shop-service/src/main/java/com/yami/shop/dao/ShopDetailMapper.java

@@ -55,6 +55,14 @@ public interface ShopDetailMapper extends BaseMapper<ShopDetail> {
      */
     void updateStatus(@Param("shopId") Long shopId, @Param("status") Integer status);
 
+
+    /**
+     * 修改营业状态和经营状态
+     * @return
+     */
+    void hbUpdateStatus(@Param("shopId") Long shopId, @Param("shopStatus") Integer shopStatus, @Param("runStatus") Integer runStatus);
+
+
     List<ShopHeadInfoDto> listHotShopsHead();
 
     Page<ShopHeadInfoDto> searchShops(@Param("page") PageParam<ShopHeadInfoDto> page, @Param("shopHeadInfoDto") ShopHeadInfoDto shopHeadInfoDto);

yami-shop-service/src/main/java/com/yami/shop/service/hb/IStoreManagementService.java

@@ -64,4 +64,9 @@ public interface IStoreManagementService {
      * @return 门店列表
      */
     IPage<ShopDetail> page(ShopDetail shopDetail, PageParam<ShopDetail> page);
+
+    /**
+     * 更改门店状态
+     */
+    void updateStatus(JSONObject HBRequest);
 }

yami-shop-service/src/main/java/com/yami/shop/service/hb/impl/StoreManagementService.java

@@ -227,4 +227,29 @@ public class StoreManagementService implements IStoreManagementService {
                 .eq(shopDetail.getHbStationId() != null, ShopDetail::getHbStationId, shopDetail.getHbStationId())
         );
     }
+
+    @Override
+    public void updateStatus(JSONObject HBRequest) {
+        log.info("海博修改门店状态{}", HBRequest);
+        JSONObject body = HBRequest.getJSONObject("body");
+
+        String outStationNo = body.getString("outStationNo");
+        String stationId = body.getString("stationId");
+
+
+        String hb = doGetStation(outStationNo);
+        JSONObject goodsInfoJson = JSON.parseObject(hb);
+        // 2. 逐层解析获取result
+        JSONObject result = goodsInfoJson.getJSONObject("result");
+        JSONObject resultData = result.getJSONObject("result");
+        Integer businessStatus = resultData.getInteger("businessStatus");
+        Integer runStatus = resultData.getInteger("runStatus");
+        ShopDetail shopDetail = shopDetailMapper.selectByHbStationId(stationId);
+        if (shopDetail != null) {
+            shopDetailMapper.hbUpdateStatus(shopDetail.getShopId(), businessStatus, runStatus);
+        }else {
+            log.error("不存在门店{}", stationId);
+        }
+
+    }
 }

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1073,6 +1073,8 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             Integer auditType = bodyStr.getInteger("auditType");
             Integer applyDeal = bodyStr.getInteger("applyDeal");
 
+            log.info("退款单状态bodyStr.getInteger{}", bodyStr.getInteger("refundStatus"));
+
             if (ObjectUtil.isNotEmpty(applyDeal)) {
                 if (applyDeal == 40) {
                     applyDeal = 2;
@@ -1104,7 +1106,13 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             } else {
                 //审核通过
                 orderRefund.setApplyType(applyDeal);
-                orderRefund.setReturnMoneySts(ReturnMoneyStsType.SUCCESS.value());
+
+                if (applyDeal != null && applyDeal.equals(10)){
+                    orderRefund.setReturnMoneySts(ReturnMoneyStsType.SUCCESS.value());
+                }else{
+
+                    orderRefund.setReturnMoneySts(ReturnMoneyStsType.SUCCESS.value());
+                }
                 orderRefundMapper.updateById(orderRefund);
 
                 //生成待商家审核记录
@@ -1117,6 +1125,7 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
                 orderRefundRecordMapper.insert(orderRefundRecord1);
             }
             //推送商家审核状态后 同步退款单状态
+
             changeStatus(orderRefund.getRefundSn(), orderRefund.getReturnMoneySts());
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
@@ -1136,21 +1145,19 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
             Integer auditType = bodyStr.getInteger("auditType");
 
             OrderRefund orderRefund = orderRefundMapper.selectOne(new LambdaQueryWrapper<OrderRefund>().eq(OrderRefund::getRefundSn, afterSaleOrder));
-            if (auditType == 2 || auditType == 4) {
-                orderRefund.setIsReceiver(true);
-                orderRefund.setReturnMoneySts(ReturnMoneyStsType.PROCESSING.value());
-            } else {
-                orderRefund.setReturnMoneySts(ReturnMoneyStsType.REJECT.value());
-                orderRefund.setRejectMessage(bodyStr.getString("reason"));
-            }
-            orderRefundMapper.updateById(orderRefund);
-
-            //3：驳回
             if (auditType == 3) {
+                //3：驳回
                 Order orderByOrderNumber = orderService.getOrderByOrderNumber(channelOrderId);
                 orderByOrderNumber.setRefundStatus(4);
                 orderService.updateById(orderByOrderNumber);
+
+                orderRefund.setReturnMoneySts(ReturnMoneyStsType.REJECT.value());
+                orderRefund.setRejectMessage(bodyStr.getString("reason"));
+            } else {
+                orderRefund.setIsReceiver(true);
+                orderRefund.setReturnMoneySts(ReturnMoneyStsType.PROCESSING.value());
             }
+            orderRefundMapper.updateById(orderRefund);
         } catch (Exception e) {
             log.error("海博退款订单查询异常：{}", e);
             HBR.error("未知异常");

yami-shop-service/src/main/resources/mapper/ShopDetailMapper.xml

@@ -60,6 +60,14 @@
             sd.`shop_status` = #{status}
         WHERE sd.`shop_id` = #{shopId}
     </update>
+
+    <update id="hbUpdateStatus">
+        UPDATE tz_shop_detail
+        SET update_time = NOW(),
+            shop_status = #{shopStatus},
+            run_status = #{runStatus}
+        WHERE shop_id = #{shopId}
+    </update>
     <select id="listHotShopsHead" resultType="com.yami.shop.bean.app.dto.ShopHeadInfoDto">
         SELECT sd.`shop_id`,
                sd.`out_station_no`,