Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

xiaoyong931011

2021-04-06 162fd6cf9cc47858c29d0b488bd7f018b77a56b4

Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into score_shop

 zq-erp/src/main/java/com/matrix/system/hive/action/ProjServiceController.java

@@ -186,13 +186,7 @@
        AjaxResult result = AjaxResult.buildSuccessInstance("查询成功");

        SysProjUse queryUse = new SysProjUse();
        if(Objects.nonNull(vipId)){
            queryUse.setVipId(vipId);
        }else{
            SysVipInfo vipInfo = getCurrentVioInfo();
            queryUse.setVipId(vipInfo.getId());
        }

        queryUse.setVipId(vipId);
        queryUse.setType(Dictionary.SHOPPING_GOODS_TYPE_XM);
        queryUse.setTaocanId(-1L);
        queryUse.setStatus(Dictionary.TAOCAN_STATUS_YX);

 zq-erp/src/main/java/com/matrix/system/hive/bean/SysVipInfo.java

@@ -261,7 +261,7 @@
    /**
     * 性别 1、男  2、女  0、未知
     */
    private String  gender;
    private Integer  gender;

    /**
     * 用户所在国家

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxShareProductAction.java

@@ -105,7 +105,7 @@
        }
        ShopShareQrcord queryOrcode = new ShopShareQrcord();
        queryOrcode.setProductId(qrcodeVo.getProductId());
        queryOrcode.setUserId(loginUser.getOpenId());
        queryOrcode.setUserId(loginUser.getId());

        if (isGroupProduct ) {
            queryOrcode.setProductId(Integer.parseInt(qrcodeVo.getActId() + ""));
@@ -120,7 +120,7 @@
            //如果未查询到就先插入数据再更新数据
            shareQrcord.setCreateBy(loginUser.getOpenId());
            shareQrcord.setUpdateBy(loginUser.getOpenId());
            shareQrcord.setUserId(loginUser.getOpenId());
            shareQrcord.setUserId(loginUser.getId());
            shareQrcord.setShopId(qrcodeVo.getShopId());
            //拼团活动
            if (isGroupProduct ) {

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxUserAction.java

@@ -174,8 +174,15 @@
        SysVipInfo loginUser = redisUserLoginUtils.getLoginUser(SysVipInfo.class);
        SysVipInfo sysVipInfo=new SysVipInfo();
        sysVipInfo.setId(loginUser.getId());

        BeanUtil.copyProperties(xcxUserSaveUserInfoDto,sysVipInfo);
        sysVipInfo.setPhone(xcxUserSaveUserInfoDto.getPhoneNumber());
        if(StringUtils.isBlank(loginUser.getVipName())){
            sysVipInfo.setVipName(xcxUserSaveUserInfoDto.getNickName());
        }
        if(StringUtils.isBlank(loginUser.getSex())){
            sysVipInfo.setSex(xcxUserSaveUserInfoDto.getGender()==1?"男":"女");
        }

        int i = sysVipInfoDao.update(sysVipInfo);


 zq-erp/src/main/java/com/matrix/system/shopXcx/bean/ShopShareQrcord.java

@@ -1,10 +1,12 @@
package com.matrix.system.shopXcx.bean;

import com.matrix.system.common.bean.EntityDTOExt;
import lombok.Data;

/**
 * 分享二维码
 */
@Data
public class  ShopShareQrcord extends EntityDTOExt {


@@ -23,7 +25,7 @@
    /**
     * 用户ID
     */
    private String  userId;
    private Long  userId;


    /**
@@ -55,69 +57,4 @@
     */
    private Long shopId;

    public Long getShopId() {
        return shopId;
    }

    public void setShopId(Long shopId) {
        this.shopId = shopId;
    }



    public String getId() {
        return id;
    }

    public void setId(String id) {
        this.id = id;
    }

    public Integer getProductId() {
        return productId;
    }

    public void setProductId(Integer productId) {
        this.productId = productId;
    }

    public String getUserId() {
        return userId;
    }

    public void setUserId(String userId) {
        this.userId = userId;
    }

    public Integer getStatus() {
        return status;
    }

    public void setStatus(Integer status) {
        this.status = status;
    }

    public Integer getVisitorCount() {
        return visitorCount;
    }

    public void setVisitorCount(Integer visitorCount) {
        this.visitorCount = visitorCount;
    }

    public String getRemark() {
        return remark;
    }

    public void setRemark(String remark) {
        this.remark = remark;
    }

    public String getQrcodeUrl() {
        return qrcodeUrl;
    }

    public void setQrcodeUrl(String qrcodeUrl) {
        this.qrcodeUrl = qrcodeUrl;
    }
}

 zq-erp/src/main/resources/static/js/function/vip.js

@@ -222,13 +222,13 @@
}


function openAddService() {
function openAddService(id) {
    layer.full(layer.open({
        type: 2,
        title: "添加服务单",
        maxmin: true,
        area: [MUI.SIZE_L, '500px'],
        content: [basePath + '/admin/redirect/hive/beautySalon/servicceAddForm']
        content: [basePath + '/admin/redirect/hive/beautySalon/servicceAddForm?id='+id]
    }));
}


 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html

@@ -928,10 +928,10 @@
                                let count = parseFloat(item.count);
                                let zkPrice = parseFloat(item.zkPrice);

                                if (optionType != 1) {
                                // if (optionType != 1) {
                                    //直接修改支付金额不重置支付金额
                                    item.payMoney = zkPrice * count;
                                }
                                // }
                                _this.order.payMoney += parseFloat(item.payMoney);

                                //重新计算业绩金额

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -1535,7 +1535,7 @@
                    return;
                }
                vipId = this.vipInfo.id;
                openAddService();
                openAddService(vipId);
            },
            // 开订单
            addOrder() {