经销商管理

doum

9 小时以前 6f846284806e47fac7c2a4a9658473f7f8e9945b

经销商管理

 admin/src/components/business/OperaCouponGoodsWindow.vue

@@ -108,6 +108,9 @@
      // 搜索
      searchForm: {
        id: '',
        name:'',
        categoryId:'',
        brandId:'',
        bindShopId: ''
      },
      shops: [],

 admin/src/components/business/OperaGoodsOrderDetail.vue

@@ -30,10 +30,11 @@
         </div>
      </div>
      <div class="info-item">
        <div class="info-item-a" style="flex: 3">归属经销商：<span >{{ info.shopName }}</span></div>
        <div class="info-item-a" style="flex: 1">归属经销商：<span >{{ info.shopName }}</span></div>
        <div class="info-item-a" style="flex: 2">客户备注：<span v-if="info.memberInfo" class="red">{{info.memberInfo}}</span></div>
      </div>
      <div class="info-item">
        <div class="info-item-a" style="flex: 3">备注：<span v-if="info.sysInfo" class="red">{{info.sysInfo}}</span>
        <div class="info-item-a" style="flex: 3">平台备注：<span v-if="info.sysInfo" class="red">{{info.sysInfo}}</span>
        <span style="margin-left: 20px;" >
           <el-button  type="text" @click="$refs.operaOrderMarkWindow.open(info.sysInfo && info.sysInfo.length?'编辑备注':'添加备注', info)">
              {{ info.sysInfo && info.sysInfo.length?'修改备注':'添加备注' }}</el-button>

 server/dmmall_service/src/main/java/com/doumee/dao/business/model/MemberCoupon.java

@@ -163,7 +163,7 @@
        insert.setMemberId(member.getId());
        insert.setShopId(coupon.getShopId());
        insert.setType(coupon.getType());
        insert.setCouponType(coupon.getType());
        insert.setCouponType(coupon.getCouponType());
        insert.setLimitPrice(coupon.getLimitPrice());
        insert.setPrice(coupon.getPrice());
        if(Constants.equalsObject(coupon.getUseType(),Constants.ZERO)){

 server/dmmall_service/src/main/java/com/doumee/service/business/impl/LabelsServiceImpl.java

@@ -98,8 +98,7 @@
            String ids = "["+labels.getId()+"],";
//            goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
//                    .setSql("zhuanqu_Ids =REPLACE(zhuanqu_Ids, '"+ids+"', '')"));
            if( labels.getApplyIdList()!=null){
                labels.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
            if( labels.getApplyIdList()!=null && labels.getApplyIdList().size()>0){
//                List<Goods> goods = goodsMapper.selectList(new QueryWrapper<Goods>().lambda().in(Goods::getId,labels.getApplyIdList() ));
                goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
                        .setSql("zhuanqu_Ids =concat(ifnull(zhuanqu_Ids,''), '"+ids+"' )")
@@ -223,8 +222,7 @@
            String ids = "["+labels.getId()+"],";
            goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
                    .setSql("zhuanqu_Ids =REPLACE(zhuanqu_Ids, '"+ids+"', '')"));
            if( labels.getApplyIdList()!=null){
                labels.getApplyIdList().stream().map(String::valueOf).collect(Collectors.joining(","));
            if( labels.getApplyIdList()!=null && labels.getApplyIdList().size()>0){
                goodsMapper.update(null,new UpdateWrapper<Goods>().lambda()
                        .setSql("zhuanqu_Ids =concat(ifnull(zhuanqu_Ids,''), '"+ids+"' )")
                        .in(Goods::getId,labels.getApplyIdList() ));