Merge branch 'api' into hive2.0

jyy

2021-01-25 949efdc17fa833f6511c0e5902057f3be0fe72c4

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

@@ -12,10 +12,7 @@
import com.matrix.core.tools.excl.ExcelUtil;
import com.matrix.system.common.bean.SysUsers;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.hive.bean.MoneyCardUse;
import com.matrix.system.hive.bean.ShoppingGoods;
import com.matrix.system.hive.bean.SysProjUse;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.hive.dao.SysProjUseDao;
@@ -26,6 +23,7 @@
import com.matrix.system.hive.service.SysProjUseService;
import com.matrix.system.hive.service.SysProjuseFreezeService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -60,6 +58,25 @@
    @Resource
    private MoneyCardUseService moneyCardUseService;

    @Resource
    private  SysProjUseDao projUseDao;

    @Autowired
    SysVipInfoDao vipInfoDao;

    @Autowired
    ShoppingGoodsDao shoppingGoodsDao;

    @Autowired
    MoneyCardUseDao moneyCardUseDao;

    @Value("${default.vip.photo.woman}")
    String defaultWoman;

    @Value("${default.vip.photo.man}")
    String defaultman;



    public static final String fnCode = "projUse";
    public static final String search = fnCode + ":search";
@@ -85,6 +102,18 @@
                projUseService.findInPage(sysProjUse, pageVo), projUseService.findTotal(sysProjUse));
    }

    /**
     * 查看会员项目使用情况
     *
     * @author jiangyouyao
     * @date 2016-09-03
     */
    @RequestMapping(value = "/findProjUseFlow")
    public @ResponseBody
    AjaxResult findProjUseFlow(PaginationVO pageVo, SysProjUseFlow projUseFlow) {
        return new AjaxResult(AjaxResult.STATUS_SUCCESS,
                projUseDao.selectProjUseFlow(projUseFlow, pageVo), projUseDao.selectProjUseFlowTotal(projUseFlow));
    }

    /**
     * 将项目设置为有效
@@ -217,10 +246,29 @@
    /**
     * 添加或修改会员項目信息
     */
    @Transactional
    @RequestMapping(value = "/addOrModify")
    public @ResponseBody
    AjaxResult addOrModify(SysProjUse sysProjUse) {
        if (sysProjUse.getId() != null) {
            SysUsers user=getMe();
            //插入修改记录
            SysProjUse oldProjUse = projUseService.findById(sysProjUse.getId());
            SysProjUseFlow projUseFlow=new SysProjUseFlow();
            projUseFlow.setProjUseId(sysProjUse.getId());
            projUseFlow.setOptionType("人工修改");
            projUseFlow.setProjName(oldProjUse.getProjName());
            projUseFlow.setCreateBy(user.getSuName());
            projUseFlow.setUpdateBy(user.getSuName());
            projUseFlow.setPrice(sysProjUse.getPrice());
            projUseFlow.setStatus(sysProjUse.getStatus());
            projUseFlow.setBalance(sysProjUse.getBalance());
            projUseFlow.setFailTime(sysProjUse.getFailTime());
            projUseFlow.setIsOver(sysProjUse.getIsOver());
            projUseFlow.setRemark(sysProjUse.getUpdateRemark());
            projUseFlow.setSurplusCount(sysProjUse.getSurplusCount());
            projUseDao.insertFlow(projUseFlow);

            return modify(projUseService, sysProjUse, "项目");
        } else {
            return add(projUseService, sysProjUse, "项目");
@@ -228,17 +276,7 @@
    }


    @Autowired
    SysVipInfoDao vipInfoDao;

    @Autowired
    ShoppingGoodsDao shoppingGoodsDao;

    @Autowired
    SysProjUseDao projUseDao;

    @Autowired
    MoneyCardUseDao moneyCardUseDao;


    @RequestMapping(value = "/importProjUse")
@@ -329,6 +367,7 @@
                vipInfo = new SysVipInfo();
                vipInfo.setShopId(sysUsers.getShopId());
                vipInfo.setPhone(telStr);
                vipInfo.setPhoto(defaultWoman);
                vipInfo.setName(objects.get(0).toString());
                vipInfoDao.insert(vipInfo);
            }
@@ -385,6 +424,7 @@
                vipInfo = new SysVipInfo();
                vipInfo.setShopId(sysUsers.getShopId());
                vipInfo.setPhone(telStr);
                vipInfo.setPhoto(defaultWoman);
                vipInfo.setName(objects.get(0).toString());
                vipInfoDao.insert(vipInfo);
            }