线上超市

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

@@ -93,11 +93,11 @@ public class SmSpuController {
     public R save(@RequestBody SmSpuEntity smSpu) {
         Long deptId = SecurityUtils.getUser().getDeptId();
         //查询商户，设置商户id
-//        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
-//        MchManageVo data = byDeptId.getData();
-//        if (Objects.isNull(data) || !data.getTypes().contains("2")){
-//            return R.failed("当前用户未绑定超市商户");
-//        }
+        R<MchManageVo> byDeptId = remoteMchService.getByDeptId(deptId, MerchantTypeEnum.SELF_SUPERMARKET);
+        MchManageVo data = byDeptId.getData();
+        if (Objects.isNull(data) || !data.getTypes().contains("2")){
+            return R.failed("当前用户未绑定超市商户");
+        }
         smSpu.setDeptId(deptId);
 //        smSpu.setMerchantId(data.getId());
         return R.ok(smSpuService.save(smSpu));

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

@@ -23,7 +23,7 @@
     <select id="selectSmErpPageScopeVo" resultType="com.bsd.pjcloud.supermarket.vo.sm.smspu.SmSpuPageVo">
           select esp.id as erp_spu_id,esp.product_code,esp.barcode,esp.product_name,esp.category_id,
                  esp.pic_url,esp.sort,esp.status,esp.merchant_id,esp.dept_id,
-                 sp.create_time,sp.id,
+                 sp.create_time,sp.id,sp.slider_pic_urls,
                  eca.name as category_name
           from sm_spu sp
           left join sm_erp_spu esp