fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderItemScrmController.java

@@ -94,4 +94,15 @@ public class FsStoreOrderItemScrmController extends BaseController
     {
         return toAjax(fsStoreOrderItemService.deleteFsStoreOrderItemByIds(itemIds));
     }
+
+    /**
+     * 修改订单数量及总价
+     */
+    @PreAuthorize("@ss.hasPermi('store:storeOrderItem:updateNum')")
+    @Log(title = "订单详情修改订单数量", businessType = BusinessType.UPDATE)
+    @PutMapping("/updateNum")
+    public AjaxResult updateNum(@RequestBody FsStoreOrderItemScrm fsStoreOrderItem)
+    {
+        return toAjax(fsStoreOrderItemService.updateFsStoreOrderItemNum(fsStoreOrderItem));
+    }
 }

fs-admin/src/main/java/com/fs/hisStore/controller/FsStoreOrderScrmController.java

@@ -727,7 +727,14 @@ public class FsStoreOrderScrmController extends BaseController {
     public AjaxResult edit(@RequestBody FsStoreOrderScrm fsStoreOrder) {
         return toAjax(fsStoreOrderService.updateFsStoreOrder(fsStoreOrder));
     }
-
+    /**
+     * 修改订单itemJson
+     */
+    @Log(title = "修改订单itemJson", businessType = BusinessType.UPDATE)
+    @GetMapping("/updateStoreOrderItemJson/{orderId}/{backendEditProductType}")
+    public AjaxResult updateStoreOrderItemJson(@PathVariable("orderId") Long orderId,@PathVariable("backendEditProductType") Integer backendEditProductType) {
+        return toAjax(fsStoreOrderService.updateStoreOrderItemJson(orderId,backendEditProductType));
+    }
     /**
      * 修改物流
      * @param fsStoreOrder

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreOrderItemScrm.java

@@ -58,6 +58,6 @@ public class FsStoreOrderItemScrm extends BaseEntity
     private Integer isGift;
 
     private Integer isDrug;
-
-
+    /** 修改后的总数量 */
+    private Integer newNum;
 }

fs-service/src/main/java/com/fs/hisStore/domain/FsStoreProductScrm.java

@@ -347,4 +347,6 @@ public class FsStoreProductScrm extends BaseEntity
     @Excel(name = "限购数量")
     private Integer purchaseLimit;
 
+    /** 过滤商品id */
+    private Long[] excludeProductIds;
 }

fs-service/src/main/java/com/fs/hisStore/mapper/FsStoreProductScrmMapper.java

@@ -149,6 +149,11 @@ public interface FsStoreProductScrmMapper
             " <if test='maps.precautions != null and maps.precautions != \"\"'>" +
             "     AND p.precautions LIKE CONCAT('%', #{maps.precautions}, '%')" +
             " </if>"+
+            "<if test = 'maps.excludeProductIds != null '>" +
+            "and p.product_id not in " +
+            "<foreach collection='maps.excludeProductIds'  item='item' index='index'  open='(' separator=',' close=')'> " +
+            " #{item} </foreach>" +
+            "</if>" +
             " order by p.product_id desc "+
             "</script>"})
     List<FsStoreProductListVO> selectFsStoreProductListVO(@Param("maps") FsStoreProductScrm fsStoreProduct);
@@ -176,6 +181,11 @@ public interface FsStoreProductScrmMapper
             "<if test = 'maps.isShow != null    '> " +
             "and p.is_show =#{maps.isShow} " +
             "</if>" +
+            "<if test = 'maps.excludeProductIds != null '>" +
+            "and p.product_id not in " +
+            "<foreach collection='maps.excludeProductIds'  item='item' index='index'  open='(' separator=',' close=')'> " +
+            " #{item} </foreach>" +
+            "</if>" +
             " order by p.product_id desc "+
             "</script>"})
     List<FsStoreProductListVO> selectFsStoreProductBarCodeListVO(@Param("maps") FsStoreProductScrm fsStoreProduct);

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreOrderItemScrmService.java

@@ -79,4 +79,6 @@ public interface IFsStoreOrderItemScrmService
     String selectFsStoreOrderItemByOrderId(Long orderId);
 
     Long selectProductIdByOrderCode(String orderCode);
+
+    int updateFsStoreOrderItemNum(FsStoreOrderItemScrm fsStoreOrderItem);
 }

fs-service/src/main/java/com/fs/hisStore/service/IFsStoreOrderScrmService.java

@@ -363,4 +363,6 @@ public interface IFsStoreOrderScrmService
      * 订单备注
      */
     R orderRemark(FsStoreOrderScrm orderScrm);
+
+    int updateStoreOrderItemJson(Long orderId,Integer backendEditProductType);
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderItemScrmServiceImpl.java

@@ -3,7 +3,10 @@ package com.fs.hisStore.service.impl;
 import java.util.Collections;
 import java.util.List;
 
+import cn.hutool.json.JSONUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.fs.his.vo.FsStoreOrderItemListDVO;
+import com.fs.hisStore.dto.FsStoreCartDTO;
 import com.fs.hisStore.param.FsStoreOrderParam;
 import com.fs.hisStore.vo.FsStoreOrderItemExportVO;
 import com.fs.hisStore.vo.FsStoreOrderItemVO;
@@ -141,4 +144,17 @@ public class FsStoreOrderItemScrmServiceImpl implements IFsStoreOrderItemScrmSer
     public Long selectProductIdByOrderCode(String orderCode) {
         return fsStoreOrderItemMapper.selectProductIdByOrderCode(orderCode);
     }
+
+    @Override
+    public int updateFsStoreOrderItemNum(FsStoreOrderItemScrm fsStoreOrderItem) {
+        FsStoreOrderItemScrm databaseItem = fsStoreOrderItemMapper.selectFsStoreOrderItemById(fsStoreOrderItem.getItemId());
+        if(databaseItem != null){
+            fsStoreOrderItem.setNum(fsStoreOrderItem.getNewNum());
+            FsStoreCartDTO fsStoreCartDTO = JSONObject.parseObject(databaseItem.getJsonInfo(), FsStoreCartDTO.class);
+            fsStoreCartDTO.setNum(fsStoreOrderItem.getNewNum());
+            fsStoreOrderItem.setJsonInfo(JSONUtil.toJsonStr(fsStoreCartDTO));
+            return fsStoreOrderItemMapper.updateFsStoreOrderItem(fsStoreOrderItem);
+        }
+        return 0;
+    }
 }

fs-service/src/main/java/com/fs/hisStore/service/impl/FsStoreOrderScrmServiceImpl.java

@@ -3,6 +3,7 @@ package com.fs.hisStore.service.impl;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.shop.request.shipping.*;
 import cn.binarywang.wx.miniapp.bean.shop.response.WxMaOrderShippingInfoGetResponse;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.date.DateTime;
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.hutool.core.net.URLDecoder;
@@ -5608,6 +5609,20 @@ public class FsStoreOrderScrmServiceImpl implements IFsStoreOrderScrmService {
         return R.error("未找到订单");
     }
 
+    @Override
+    public int updateStoreOrderItemJson(Long orderId,Integer backendEditProductType) {
+        FsStoreOrderScrm order = new FsStoreOrderScrm();
+        order.setId(orderId);
+        List<FsStoreOrderItemVO> orderItemVOS = fsStoreOrderItemMapper.selectFsStoreOrderItemListByOrderId(orderId);
+        if(CollectionUtil.isNotEmpty(orderItemVOS)){
+            order.setItemJson(JSON.toJSONString(orderItemVOS));
+        }else{
+            order.setItemJson("");
+        }
+        order.setBackendEditProductType(backendEditProductType);
+        return fsStoreOrderMapper.updateFsStoreOrder(order);
+    }
+
     private static final DateTimeFormatter CST_FORMATTER = DateTimeFormatter
             .ofPattern("EEE MMM dd HH:mm:ss zzz yyyy", Locale.US)
             .withZone(ZoneId.of("Asia/Shanghai"));

fs-service/src/main/resources/mapper/hisStore/FsStoreOrderScrmMapper.xml

@@ -89,10 +89,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="orderVisit"    column="order_visit"    />
         <result property="serviceFee"    column="service_fee"    />
         <!--<result property="orderMedium"    column="order_medium"    />-->
+        <result property="backendEditProductType"    column="backend_edit_product_type"    />
     </resultMap>
 
     <sql id="selectFsStoreOrderVo">
-        select id, order_code,service_fee, extend_order_id,pay_order_id,bank_order_id, user_id,order_visit, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage,pay_delivery,pay_money, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, create_time, update_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_sn, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, pay_integral, back_integral, mark, is_del, remark, cost, verify_code, store_id, shipping_type, is_channel, is_remind, is_sys_del,is_prescribe,prescribe_id ,company_id,company_user_id,is_package,package_json,item_json,order_type,package_id,finish_time,delivery_status,delivery_pay_status,delivery_time,delivery_pay_time,delivery_pay_money,tui_money,tui_money_status,delivery_import_time,tui_user_id,tui_user_money_status,order_create_type,store_house_code,dept_id,is_edit_money,customer_id,is_pay_remain,delivery_send_time,certificates,schedule_id from fs_store_order_scrm
+        select id, order_code,service_fee, extend_order_id,pay_order_id,bank_order_id, user_id,order_visit, real_name, user_phone, user_address, cart_id, freight_price, total_num, total_price, total_postage, pay_price, pay_postage,pay_delivery,pay_money, deduction_price, coupon_id, coupon_price, paid, pay_time, pay_type, create_time, update_time, status, refund_status, refund_reason_wap_img, refund_reason_wap_explain, refund_reason_time, refund_reason_wap, refund_reason, refund_price, delivery_sn, delivery_name, delivery_type, delivery_id, gain_integral, use_integral, pay_integral, back_integral, mark, is_del, remark, cost, verify_code, store_id, shipping_type, is_channel, is_remind, is_sys_del,is_prescribe,prescribe_id ,company_id,company_user_id,is_package,package_json,item_json,order_type,package_id,finish_time,delivery_status,delivery_pay_status,delivery_time,delivery_pay_time,delivery_pay_money,tui_money,tui_money_status,delivery_import_time,tui_user_id,tui_user_money_status,order_create_type,store_house_code,dept_id,is_edit_money,customer_id,is_pay_remain,delivery_send_time,certificates,schedule_id,backend_edit_product_type from fs_store_order_scrm
     </sql>
 
     <select id="selectFsStoreOrderList" parameterType="FsStoreOrderScrm" resultMap="FsStoreOrderResult">
@@ -152,6 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deliveryPayStatus != null "> and delivery_pay_status = #{deliveryPayStatus}</if>
             <if test="deliveryTime != null "> and delivery_time = #{deliveryTime}</if>
             <if test="deliveryImportTime != null "> and delivery_import_time = #{deliveryImportTime}</if>
+            <if test="backendEditProductType != null "> and backend_edit_product_type = #{backendEditProductType}</if>
         </where>
     </select>
 
@@ -256,6 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="followTime != null">follow_time,</if>
             <if test="followDoctorId != null">follow_doctor_id,</if>
             <if test="cycle != null">cycle,</if>
+            <if test="backendEditProductType != null">backend_edit_product_type,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="orderCode != null and orderCode != ''">#{orderCode},</if>
@@ -342,6 +345,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="followTime != null">#{followTime},</if>
             <if test="followDoctorId != null">#{followDoctorId},</if>
             <if test="cycle != null">#{cycle},</if>
+            <if test="backendEditProductType != null">#{backendEditProductType},</if>
          </trim>
     </insert>
 
@@ -435,6 +439,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="followDoctorId != null">follow_doctor_id = #{followDoctorId},</if>
             <if test="cycle != null">cycle = #{cycle},</if>
             <if test="orderRemark != null">order_remark = #{orderRemark},</if>
+            <if test="backendEditProductType != null">backend_edit_product_type = #{backendEditProductType},</if>
         </trim>
         where id = #{id}
     </update>