修复

pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/vo/app/SupermarketAppSpuVo.java

@@ -1,6 +1,10 @@
 package com.bsd.pjcloud.supermarket.vo.app;
 
 
+import com.bsd.pjcloud.common.core.util.MoneyDeserializer;
+import com.bsd.pjcloud.common.core.util.MoneySerializer;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
@@ -35,7 +39,7 @@ public class SupermarketAppSpuVo {
      * 库存
      */
     @Schema(description="剩余库存")
-    private Integer stock;
+    private Double stock;
 
 
     /**
@@ -49,6 +53,20 @@ public class SupermarketAppSpuVo {
     @Schema(description = "销量")
     private Integer salesCount;
 
+    /**
+     * 零售价/单位分
+     */
+    @Schema(description="零售价/单位分")
+//    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+//    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+    private Integer retailPrice;
 
+    /**
+     * 促销价
+     */
+    @Schema(description="促销价")
+//    @JsonSerialize(using = MoneySerializer.class) // 分 -> 元
+//    @JsonDeserialize(using = MoneyDeserializer.class) // 元 -> 分
+    private Integer promotionPrice;
 
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java

@@ -290,7 +290,7 @@ public class SmErpSpuController {
      * 条件查询spu单表 列表信息
      * @param supermarketSpuQueryDTO 商品spu
      * @return
-     */
+     *///todo 待完善，返回的参数不全，有问题
     @Operation(summary = "APP根据条件查询分页SPU" , description = "APP条件分页查询" )
     @PostMapping("/app/selectListAll" )
     @PreAuthorize("@pms.hasPermission('supermarket_supermarketSpu_view')" )

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmSpuController.java

@@ -93,9 +93,12 @@ public class SmSpuController {
         Long deptId = SecurityUtils.getUser().getDeptId();
         //查询商户，设置商户id
         R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId);
-        Long mearchantId= byDeptId.getData().getId();
+        MchManageVo data = byDeptId.getData();
+        if (Objects.isNull(data) || !data.getTypes().contains("2")){
+            return R.failed("当前用户未绑定超市商户");
+        }
         smSpu.setDeptId(deptId);
-        smSpu.setMerchantId(mearchantId);
+        smSpu.setMerchantId(data.getId());
         return R.ok(smSpuService.save(smSpu));
     }
 
@@ -138,4 +141,8 @@ public class SmSpuController {
     public List<SmSpuEntity> export(SmSpuEntity smSpu,Long[] ids) {
         return smSpuService.list(Wrappers.lambdaQuery(smSpu).in(ArrayUtil.isNotEmpty(ids), SmSpuEntity::getId, ids));
     }
+
+
+
+
 }

pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmSpuMapper.xml

@@ -34,14 +34,16 @@
     </select>
 
     <select id="getAppPage" resultType="com.bsd.pjcloud.supermarket.vo.app.SupermarketAppSpuVo">
-        SELECT sp.id,sp.slider_pic_urls,esp.product_name, esp.pic_url,stock.current_stock as stock, esp.sales_count, esp.retail_price, esp.promotion_price
+        SELECT sp.id,sp.slider_pic_urls,esp.product_name, esp.pic_url,stock.current_stock as stock, esp.sales_count, u.retail_price, u.promotion_price
         FROM `sm_spu` sp
-                 LEFT JOIN sm_erp_spu esp
-                           on sp.erp_spu_id = esp.id
+        LEFT JOIN sm_erp_spu esp
+        on sp.erp_spu_id = esp.id
+        LEFT JOIN sm_erp_unit u
+        on esp.id=u.spu_id
         LEFT JOIN sm_erp_stock stock
-                           on esp.id = stock.erp_spu_id
+        on esp.id = stock.erp_spu_id
         <where>
-            esp.status = 0 and esp.merchant_id=${supermarketSpuQueryDTO.merchantId}
+            esp.status = 0 and sp.merchant_id=${supermarketSpuQueryDTO.merchantId}
             <if test="supermarketSpuQueryDTO.productName != null and supermarketSpuQueryDTO.productName != ''">
                and esp.product_name like concat('%', #{supermarketSpuQueryDTO.productName}, '%')
             </if>