批量导入商品新增库存列，新增修改商品时触发更新小程序首页加载商品字段

kmall-admin/src/main/java/com/kmall/admin/controller/ProductStoreRelaController.java

@@ -99,12 +99,6 @@ public class ProductStoreRelaController {
     @ResponseBody
     public R save(@RequestBody ProductStoreRelaEntity productStoreRela) {
 
-        if (productStoreRela.getStoreId() != null) {
-            StoreEntity store = storeService.queryObject(productStoreRela.getStoreId().intValue());
-            if (store != null) {
-                productStoreRela.setMerchSn(store.getMerchSn());
-            }
-        }
         productStoreRelaService.save(productStoreRela);
 
         return R.ok();
@@ -122,11 +116,6 @@ public class ProductStoreRelaController {
             return R.error("信息不全，保存失败");
         }
 
-        StoreEntity store = storeService.queryObject(productStoreRela.getStoreId().intValue());
-        if (store != null) {
-            productStoreRela.setMerchSn(store.getMerchSn());
-        }
-
         productStoreRelaService.update(productStoreRela);
         return R.ok();
     }

kmall-admin/src/main/java/com/kmall/admin/dto/GoodsDto.java

@@ -27,7 +27,7 @@ public class GoodsDto implements Serializable {
     //品牌
     private String brand;
     //商品库存
-    private Integer goodsNumber;
+    private String goodsNumber;
     //关键字
     private String keywords;
     //简明介绍
@@ -242,14 +242,14 @@ public class GoodsDto implements Serializable {
     /**
      * 设置：商品序列号
      */
-    public void setGoodsNumber(Integer goodsNumber) {
+    public void setGoodsNumber(String goodsNumber) {
         this.goodsNumber = goodsNumber;
     }
 
     /**
      * 获取：商品序列号
      */
-    public Integer getGoodsNumber() {
+    public String getGoodsNumber() {
         return goodsNumber;
     }
 

kmall-admin/src/main/java/com/kmall/admin/entity/StoreEntity.java

@@ -75,10 +75,23 @@ public class StoreEntity implements Serializable {
     private Date tstm;
 
     private String thirdPartyMerchCode;
+
     private String thirdPartyMerchName;
+
     private String exprAgreementType;
+
     private String isValid;
 
+    private String isLoadGoods;
+
+    public String getIsLoadGoods() {
+        return isLoadGoods;
+    }
+
+    public void setIsLoadGoods(String isLoadGoods) {
+        this.isLoadGoods = isLoadGoods;
+    }
+
     public String getIsValid() {
         return isValid;
     }

kmall-admin/src/main/java/com/kmall/admin/service/impl/GoodsServiceImpl.java

@@ -108,7 +108,7 @@ public class GoodsServiceImpl implements GoodsService {
 //        builder.put("brandId", "品牌");
         builder.put("supplierId", "供应商");
 //        builder.put("freightId", "运费模版");
-        builder.put("goodsNumber", "商品库存");
+        builder.put("goodsNumber", "商品总库存");
         builder.put("primaryPicUrl", "商品主图");
         builder.put("listPicUrl", "商品列表图");
         builder.put("goodsDesc", "商品描述");
@@ -280,7 +280,7 @@ public class GoodsServiceImpl implements GoodsService {
         builder.put("goodsBizType", "货品业务类型");
 //        builder.put("brandId", "品牌");
         builder.put("supplierId", "供应商");
-        builder.put("goodsNumber", "商品库存");
+        builder.put("goodsNumber", "商品总库存");
 //        builder.put("freightId", "运费模版");
         builder.put("primaryPicUrl", "商品主图");
         builder.put("listPicUrl", "商品列表图");
@@ -338,8 +338,11 @@ public class GoodsServiceImpl implements GoodsService {
         Integer goodsNumber = goods.getGoodsNumber();//商品总库存
         Integer storeTotalGoodsNumber = 0;//商品分配库存
         List<ProductStoreRelaEntity> proStoreList = productStoreRelaDao.queryByGoodsId(goodsEntity.getId());
-        for(ProductStoreRelaEntity relaEntity: proStoreList){
+        Long[] storeIds = new Long[proStoreList.size()];
+        for(int i = 0; i < proStoreList.size(); i++){
+            ProductStoreRelaEntity relaEntity = proStoreList.get(i);
             storeTotalGoodsNumber = storeTotalGoodsNumber + relaEntity.getStockNum();
+            storeIds[i] = relaEntity.getStoreId();
         }
         if(goodsNumber < storeTotalGoodsNumber){
             throw new RRException("该商品已在各门店分配库存"+storeTotalGoodsNumber+"，当前商品总库存不能小于分配库存总额！请先修改门店库存！");
@@ -535,9 +538,29 @@ public class GoodsServiceImpl implements GoodsService {
                 return productDao.update(product);
             }
         }
+        //更新门店商品是否有修改字段
+        if(storeIds.length > 0){
+            for(int i=0;i<storeIds.length;i++){
+                updateLoadGoodsByStoreId(storeIds[i], user);
+            }
+        }
         return 1;
     }
 
+    /**
+     * 更新门店商品是否有修改字段
+     * @param storeId
+     * @param user
+     */
+    private void updateLoadGoodsByStoreId(Long storeId, SysUserEntity user){
+        StoreEntity storeEntity = new StoreEntity();
+        storeEntity.setIsLoadGoods("1");
+        storeEntity.setModerSn(user.getUsername());
+        storeEntity.setModTime(new Date());
+        storeEntity.setId(storeId);
+        storeDao.update(storeEntity);
+    }
+
     @Override
     public int delete(Integer id) {
         SysUserEntity user = ShiroUtils.getUserEntity();
@@ -677,6 +700,7 @@ public class GoodsServiceImpl implements GoodsService {
 //                builder.put("marketPrice", "市场价");
 //                builder.put("retailPrice", "零售价");
                 builder.put("supplierName", "供应商");
+                builder.put("goodsNumber", "商品总库存");
                 R r = ValidatorUtil.isEmpty(builder.build(), valideDate);
                 if (Integer.valueOf(r.get("code").toString()) != 0) {
                     throw new RRException(r.get("msg").toString());
@@ -809,7 +833,7 @@ public class GoodsServiceImpl implements GoodsService {
                     } else {
                         goodsEntity.setOriCntCode(sysCusNationCodeEntity.getCode());
                     }
-                    goodsEntity.setGoodsRate(BigDecimal.valueOf(Integer.valueOf(goodsDto.getGoodsRate())));
+                    goodsEntity.setGoodsRate(BigDecimal.valueOf(Double.valueOf(goodsDto.getGoodsRate())));
                 }
                 goodsEntity.setIsOnSale(Integer.parseInt(goodsDto.getIsOnSaleStr()));
                 goodsEntity.setIsHot(Integer.parseInt(goodsDto.getIsHotStr()));
@@ -832,6 +856,7 @@ public class GoodsServiceImpl implements GoodsService {
                 goodsEntity.setCreateTime(new Date());
                 goodsEntity.setUpdateTime(new Date());
                 goodsEntity.setModTime(new Date());
+                goodsEntity.setGoodsNumber(Integer.parseInt(goodsDto.getGoodsNumber()));
 
                 if(!isFail){
                     GoodsEntity goods = goodsDao.queryObjectBySn(goodsDto.getGoodsSn());

kmall-admin/src/main/java/com/kmall/admin/service/impl/ProductStoreRelaServiceImpl.java

@@ -57,6 +57,8 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
     private StoreMngChangeDao storeMngChangeDao;
     @Autowired
     private MkDistSellAllocationDao mkDistSellAllocationDao;
+    @Autowired
+    private StoreDao storeDao;
 
     @Override
     public ProductStoreRelaEntity queryObject(Integer id) {
@@ -142,9 +144,16 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
                 throw new RRException("该商品轮播图不能为空！请先在商品管理》所有商品中维护商品编号为【"+goodsEntity.getGoodsSn()+"】的商品详情轮播图信息，再来操作门店商品数据");
             }
         }
+        if (productStoreRela.getStoreId() != null) {
+            StoreEntity store = storeDao.queryObject(productStoreRela.getStoreId().intValue());
+            if (store != null) {
+                productStoreRela.setMerchSn(store.getMerchSn());
+            }
+        }
         if(!goodsEntity.getMerchSn().equalsIgnoreCase(productStoreRela.getMerchSn())) {
             throw new RRException("该商品所属商户不属于该门店所属商户！");
         }
+        //校验总库存
         checkStockNum(productStoreRela, goodsEntity, isStockShare);
 
         String storeId = String.valueOf(productStoreRela.getStoreId());
@@ -234,6 +243,9 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         storeMngChangeEntity.setIsValid(0);
         storeMngChangeDao.save(storeMngChangeEntity);
 
+        //更新门店商品是否有修改字段
+        updateLoadGoodsByStoreId(storeId, user);
+
         productStoreRela.setAttributeCategory(categoryDao.queryObject(productStoreRela.getCategoryId()).getParentId());
         productStoreRela.setProductId(product.getId());
         productStoreRela.setGoodsBizType(goodsEntity.getGoodsBizType());
@@ -268,6 +280,12 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         if (Integer.valueOf(r.get("code").toString()) != 0) {
             throw new RRException(r.get("msg").toString());
         } else {
+            StoreEntity store = storeDao.queryObject(productStoreRela.getStoreId().intValue());
+            if (store != null) {
+                productStoreRela.setMerchSn(store.getMerchSn());
+            }else{
+                throw new RRException("门店信息不存在！");
+            }
             goodsEntity = goodsDao.queryObjectByStoreId(productStoreRela.getGoodsId(), productStoreRela.getStoreId());
             isStockShare = StockUtil.getIsStockShareByGoodsEntity(goodsEntity.getIsSupplierGoods(),
                     goodsEntity.getIsStockShare(), goodsEntity.getIsStockShareBySuppler());
@@ -293,7 +311,7 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         if(!goodsEntity.getMerchSn().equalsIgnoreCase(productStoreRela.getMerchSn())) {
             throw new RRException("该商品所属商户不属于该门店所属商户！");
         }
-
+        //校验总库存
         checkStockNum(productStoreRela, goodsEntity, isStockShare);
 
         String storeId = String.valueOf(productStoreRela.getStoreId());
@@ -420,6 +438,8 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
             storeMngChangeEntity.setStoreValidNum(changeNum);//可用数
             storeMngChangeDao.save(storeMngChangeEntity);
         }
+        //更新门店商品是否有修改字段
+        updateLoadGoodsByStoreId(storeId, user);
 
         productStoreRela.setAttributeCategory(categoryDao.queryObject(productStoreRela.getCategoryId()).getParentId());
         productStoreRela.setModerSn(user.getUserId().toString());
@@ -428,6 +448,26 @@ public class ProductStoreRelaServiceImpl implements ProductStoreRelaService {
         return productStoreRelaDao.update(productStoreRela);
     }
 
+    /**
+     * 更新门店商品是否有修改字段
+     * @param storeId
+     * @param user
+     */
+    private void updateLoadGoodsByStoreId(String storeId, SysUserEntity user){
+        StoreEntity storeEntity = new StoreEntity();
+        storeEntity.setIsLoadGoods("1");
+        storeEntity.setModerSn(user.getUsername());
+        storeEntity.setModTime(new Date());
+        storeEntity.setId(Long.valueOf(storeId));
+        storeDao.update(storeEntity);
+    }
+
+    /**
+     * 校验总库存
+     * @param productStoreRela
+     * @param goodsEntity
+     * @param isStockShare
+     */
     private void checkStockNum(ProductStoreRelaEntity productStoreRela, GoodsEntity goodsEntity, String isStockShare){
         if(goodsEntity.getGoodsBizType().equalsIgnoreCase(Dict.orderBizType.item_00.getItem()) && isStockShare.equalsIgnoreCase(Dict.isStockShare.item_1.getItem())){
             Integer stockNum = productStoreRela.getStockNum();

kmall-admin/src/main/resources/XmlTemplate/GeneralGoodsDtoList.xml

@@ -17,6 +17,7 @@
                 <mapping row="1" col="6">GoodsDto.isOnSaleStr</mapping>
                 <mapping row="1" col="7">GoodsDto.goodsUnit</mapping>
                 <mapping row="1" col="8">GoodsDto.isHotStr</mapping>
+                <mapping row="1" col="8">GoodsDto.goodsNumber</mapping>
                 <!--<mapping row="1" col="12">GoodsDto.marketPrice</mapping>-->
                 <!--<mapping row="1" col="13">GoodsDto.retailPrice</mapping>-->
             </section>

kmall-admin/src/main/resources/XmlTemplate/GoodsDtoList.xml

@@ -28,6 +28,7 @@
                 <mapping row="1" col="15">GoodsDto.oriCntName</mapping>
                 <mapping row="1" col="16">GoodsDto.cusDeclEle</mapping>
                 <mapping row="1" col="17">GoodsDto.cusRecCode</mapping>
+                <mapping row="1" col="18">GoodsDto.goodsNumber</mapping>
             </section>
             <loopbreakcondition>
                 <rowcheck offset="0">

kmall-admin/src/main/resources/mybatis/mapper/StoreDao.xml

@@ -27,6 +27,7 @@
 		<result property="thirdPartyMerchName" column="third_party_merch_name"/>
 		<result property="exprAgreementType" column="expr_agreement_type"/>
 		<result property="isValid" column="is_valid"/>
+		<result property="isLoadGoods" column="is_load_goods"/>
 
     </resultMap>
 
@@ -43,7 +44,7 @@
 			`county_name`,
 			`latitude`,
 			`longitude`,
-			`cover_radius`,expr_agreement_type,
+			`cover_radius`,expr_agreement_type,is_load_goods,
 			`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
 		moder_sn, mod_time, tstm,is_valid
 		from mall_store
@@ -63,7 +64,7 @@
 		`county_name`,
 		`latitude`,
 		`longitude`,
-		`cover_radius`,expr_agreement_type,
+		`cover_radius`,expr_agreement_type,is_load_goods,
 		`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
     moder_sn, mod_time, tstm,is_valid
 		from mall_store
@@ -103,7 +104,7 @@
 		s.`county_name`,
 		s.`latitude`,
 		s.`longitude`,
-		s.`cover_radius`,
+		s.`cover_radius`,s.is_load_goods,
 		s.`remark`,s.merch_sn, s.merch_name, s.creater_sn, s.create_time,s.third_party_merch_code,t.third_party_merch_name,s.expr_agreement_type,
 		s.moder_sn, s.mod_time, s.tstm,s.is_valid
 		from mall_store s left join third_merchant_biz t on s.third_party_merch_code = t.third_party_merch_code
@@ -179,6 +180,7 @@
 			`longitude`,
 			`cover_radius`,
 			is_valid,
+			is_load_goods,
 			`remark`,
 			third_party_merch_code,
 			third_party_merch_name,
@@ -201,6 +203,7 @@
 			#{longitude},
 			#{coverRadius},
 			#{isValid},
+			#{isLoadGoods},
 			#{remark},
 			#{thirdPartyMerchCode},
 			#{thirdPartyMerchName},
@@ -211,7 +214,7 @@
 			#{modTime}
 		)
 	</insert>
-	 
+
 	<update id="update" parameterType="com.kmall.admin.entity.StoreEntity">
 		update mall_store
 		<set>
@@ -227,6 +230,7 @@
 			<if test="longitude != null">`longitude` = #{longitude}, </if>
 			<if test="coverRadius != null">`cover_radius` = #{coverRadius}, </if>
 			<if test="isValid != null">`is_valid` = #{isValid}, </if>
+			<if test="isLoadGoods != null">`is_load_goods` = #{isLoadGoods}, </if>
 			<if test="remark != null">`remark` = #{remark},</if>
 			<if test="createrSn != null" >creater_sn = #{createrSn},</if>
 			<if test="createTime != null" >create_time = #{createTime},</if>

kmall-admin/src/main/webapp/js/shop/goods.js

@@ -440,8 +440,11 @@ var vm = new Vue({
                 } else {
                     vm.productEntityList = [{'id': '', 'goodsId': '', 'goodsSpecificationIds': '', 'goodsSpecificationNameValue': '', 'goodsSn': '', 'goodsNumber': '', 'isDelete': 0, 'goodsDefault': 0}];
                 }*/
-
-                $('#goodsDesc').editable('setHTML', vm.goods.goodsDesc);
+                if(vm.goods.goodsDesc){
+                    $('#goodsDesc').editable('setHTML', vm.goods.goodsDesc);
+                }else{
+                    $('#goodsDesc').editable('setHTML', '');
+                }
             });
         },
         reload: function (event) {

kmall-admin/src/main/webapp/statics/libs/jquery-extend.js

@@ -12,7 +12,7 @@
                 styleUI: 'Bootstrap',
                 datatype: "json",
                 viewrecords: true,
-                height: 385,
+                height: 550,
                 rowNum: 10,
                 rowList: [10, 30, 50],
                 rownumbers: true,

kmall-api/src/main/java/com/kmall/api/api/ApiAuthController.java

@@ -134,24 +134,6 @@ public class ApiAuthController extends ApiBaseAction {
     }
 
     /**
-     * 根据经纬度选择门店，微信审核后删除
-     */
-    @GetMapping("nearbyList")
-    @IgnoreAuth
-    public Object nearbyList(@RequestParam BigDecimal latitude, @RequestParam BigDecimal longitude, @RequestParam String storeId) {
-        Map param = Maps.newHashMap();
-         if(org.apache.commons.lang3.StringUtils.isNotEmpty(storeId)){
-            param.put("storeId", storeId);
-        }
-        param.put("latitude", latitude);
-        param.put("longitude", longitude);
-        List<StoreVo> storeVoList = apiStoreService.queryNearbyList(param);
-        if (null != storeVoList && storeVoList.size() > 0 && null != getOpenId()) {
-            tokenService.createAndUpdateToken(getOpenId(), storeVoList.get(0).getId(),getUserId(),storeVoList.get(0).getMerchSn());
-        }
-        return toResponsSuccess(storeVoList);
-    }
-    /**
      * 根据经纬度选择门店
      */
     @GetMapping("nearbyLists")
@@ -173,6 +155,16 @@ public class ApiAuthController extends ApiBaseAction {
         return toResponsSuccess(storeVoList);
     }
 
+    @GetMapping("updateStoreLoadGoodsById")
+    @IgnoreAuth
+    public Object updateStoreLoadGoodsById(@RequestParam String storeId) {
+        StoreVo storeVo = new StoreVo();
+        storeVo.setId(Long.valueOf(storeId));
+        storeVo.setIsLoadGoods("0");//门店商品是否修改字段更新为否
+        apiStoreService.updateStoreLoadGoodsById(storeVo);
+        return toResponsSuccess("成功");
+    }
+
     /**
      * 根据城市获取门店
      */

kmall-api/src/main/java/com/kmall/api/api/ApiCartController.java

@@ -683,56 +683,6 @@ public class ApiCartController extends ApiBaseAction {
         resultObj.put("cartTotal", cartTotal);
         return toResponsSuccess(resultObj);
     }
-
-    /**
-     * 订单提交前的检验和填写相关订单信息，微信审核后删除
-     */
-    @GetMapping("checkout")
-    public Object checkout(@LoginUser UserVo loginUser, String merchSn, String checkCart, Long tickDiscId00, Long tickDiscId02, Long tickDiscId10, Long tickDiscId11,
-                           Integer campId00, Integer campId02, Integer campId10, Integer campId11, Integer isLoadStatus) {
-        //获取要购买的商品
-        Map<String, Object> cartData = (Map<String, Object>)this.getCartMoney(loginUser,checkCart);
-        CheckOutDto checkOutDto = new CheckOutDto();
-        checkOutDto.setCheckCart(checkCart);
-        checkOutDto.setLoginUser(loginUser);
-        checkOutDto.setTickDiscId00(tickDiscId00);
-        checkOutDto.setTickDiscId02(tickDiscId02);
-        checkOutDto.setTickDiscId10(tickDiscId10);
-        checkOutDto.setTickDiscId11(tickDiscId11);
-        checkOutDto.setCampId00(campId00);
-        checkOutDto.setCampId02(campId02);
-        checkOutDto.setCampId10(campId10);
-        checkOutDto.setCampId11(campId11);
-        checkOutDto.setStoreId(getStoreId());
-        checkOutDto.setCartData(cartData);
-        checkOutDto.setIsLoadStatus(isLoadStatus);
-
-        Map<String, Object> resultObj = cartService.getCheckOut(checkOutDto);
-
-        //选择的收货地址
-        Map param = Maps.newHashMap();
-        param.put("is_default", 1);
-        param.put("user_id", loginUser.getId());
-        List<AddressVo> addressEntityList = addressService.queryList(param);
-        if (null != addressEntityList && addressEntityList.size() > 0) {
-            resultObj.put("addressVo", addressEntityList.get(0));
-        } else { // 没有默认地址,选择一个
-            param = Maps.newHashMap();
-            param.put("user_id", loginUser.getId());
-            addressEntityList = addressService.queryList(param);
-            if (null != addressEntityList && addressEntityList.size() > 0) {
-                resultObj.put("addressVo", addressEntityList.get(0));
-            }
-        }
-        UserVo userVo = apiUserService.queryObject(loginUser.getId());
-        if(userVo != null){
-            resultObj.put("idNo", userVo.getIdNo());
-            resultObj.put("userName", userVo.getUsername());
-        }
-
-        return toResponsSuccess(resultObj);
-    }
-
     /**
      * 订单提交前的检验和填写相关订单信息
      */

kmall-api/src/main/java/com/kmall/api/api/ApiGoodsController.java

@@ -364,7 +364,7 @@ public class ApiGoodsController extends ApiBaseAction {
 
         List<GoodsVo> goodsEntityList = goodsService.queryList(params);
         params.remove("fields");
-        filterCategory.addAll(categoryService.getFilterCategory(goodsEntityList, filterCategory));
+        categoryService.getFilterCategory(goodsEntityList, filterCategory);
 
         params.put("category_parent_id", categoryId);
         params.put("fields", "a.id,a.name,a.goods_brief,a.list_pic_url,psr1.retail_price," +

kmall-api/src/main/java/com/kmall/api/dao/ApiStoreMapper.java

@@ -18,4 +18,6 @@ import java.util.Map;
 @Service
 public interface ApiStoreMapper extends BaseDao<StoreVo> {
     List<StoreVo> queryNearbyList(Map param);
+
+    Integer updateStoreLoadGoodsById(StoreVo storeVo);
 }

kmall-api/src/main/java/com/kmall/api/entity/StoreVo.java

@@ -69,9 +69,31 @@ public class StoreVo implements Serializable {
     private String merchName;
 
     private String thirdPartyMerchCode;
+
     private String thirdPartyMerchName;
+
     private String isValid;
 
+    private String isLoadGoods;
+
+    private String moderSn;
+
+    public String getModerSn() {
+        return moderSn;
+    }
+
+    public void setModerSn(String moderSn) {
+        this.moderSn = moderSn;
+    }
+
+    public String getIsLoadGoods() {
+        return isLoadGoods;
+    }
+
+    public void setIsLoadGoods(String isLoadGoods) {
+        this.isLoadGoods = isLoadGoods;
+    }
+
     public String getIsValid() {
         return isValid;
     }

kmall-api/src/main/java/com/kmall/api/service/ApiStoreService.java

@@ -36,4 +36,7 @@ public class ApiStoreService {
         return apiStoreMapper.queryNearbyList(map);
     }
 
+    public int updateStoreLoadGoodsById(StoreVo storeVo){
+        return apiStoreMapper.updateStoreLoadGoodsById(storeVo);
+    }
 }

kmall-api/src/main/java/com/kmall/api/service/mk/ApiMkStoreCampMinusGoodsService.java

@@ -87,7 +87,7 @@ public class ApiMkStoreCampMinusGoodsService {
 
         List<GoodsVo> goodsEntityList = apiGoodsMapper.queryList(params);
         params.remove("fields");
-        filterCategory.addAll(categoryService.getFilterCategory(goodsEntityList, filterCategory));
+        categoryService.getFilterCategory(goodsEntityList, filterCategory);
 
         params.put("category_parent_id", categoryId);
         params.put("fields", "a.id,a.name,a.goods_brief,a.list_pic_url,psr1.retail_price," +

kmall-api/src/main/resources/mybatis/mapper/ApiStoreMapper.xml

@@ -18,11 +18,7 @@
         <result property="distance" column="distance"/>
         <result column="merch_sn" property="merchSn" jdbcType="VARCHAR" />
         <result column="merch_name" property="merchName" jdbcType="VARCHAR" />
-        <result column="creater_sn" property="createrSn" jdbcType="VARCHAR" />
-        <result column="create_time" property="createTime" jdbcType="TIMESTAMP" />
         <result column="moder_sn" property="moderSn" jdbcType="VARCHAR" />
-        <result column="mod_time" property="modTime" jdbcType="TIMESTAMP" />
-        <result column="tstm" property="tstm" jdbcType="TIMESTAMP" />
 
         <result property="thirdPartyMerchCode" column="third_party_merch_code"/>
         <result property="thirdPartyMerchName" column="third_party_merch_name"/>
@@ -41,8 +37,13 @@
 			`latitude`,
 			`longitude`,
 			`cover_radius`,
-			`remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
-    moder_sn, mod_time, tstm
+			is_load_goods,
+			`remark`,
+			merch_sn,
+			merch_name,
+			third_party_merch_code,
+			third_party_merch_name,
+			moder_sn
 		from mall_store
 		where id = #{id} and is_valid = 0
 	</select>
@@ -59,8 +60,12 @@
         `latitude`,
         `longitude`,
         `cover_radius`,
-        `remark`,merch_sn, merch_name, creater_sn, create_time,third_party_merch_code,third_party_merch_name,
-        moder_sn, mod_time, tstm
+        `remark`,
+        merch_sn,
+        merch_name,
+        third_party_merch_code,
+        third_party_merch_name,
+        is_load_goods
         from mall_store
         WHERE 1=1  and is_valid = 0
         <if test="province_name != null and province_name.trim() != ''">
@@ -160,11 +165,9 @@
             *pow(sin((a.longitude*pi()/180-#{longitude}*pi()/180)/2),2)))*1000) as distance,
         merch_sn,
         merch_name,
-        creater_sn,
-        create_time,
-        moder_sn,
-        mod_time,
-        tstm,third_party_merch_code,third_party_merch_name
+        is_load_goods,
+        third_party_merch_code,
+        third_party_merch_name
         from mall_store a
         WHERE 1=1  and is_valid = 0
         <if test="province_name != null and province_name.trim() != ''">
@@ -186,4 +189,13 @@
         order by distance asc
         limit 0, 10
     </select>
+    <update id="updateStoreLoadGoodsById" parameterType="com.kmall.api.entity.StoreVo">
+        update mall_store
+        <set>
+            <if test="isLoadGoods != null">`is_load_goods` = #{isLoadGoods}, </if>
+            mod_time = now()
+        </set>
+        where id = #{id}
+    </update>
+
 </mapper>