Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

Helius

2021-01-25 0eb83b49a381c31a51b8c8cec9e4d9d88fd5d16f

Merge branch 'api' of https://gitee.com/jyyforjava/zq-erp into api

 zq-erp/src/main/java/com/matrix/system/app/vo/BusinessesDataShowVo.java

@@ -275,7 +275,7 @@
    }

    public BigDecimal getPeopleCnt() {
        return peopleCnt;
        return peopleCnt == null ? BigDecimal.ZERO : peopleCnt.setScale(2, BigDecimal.ROUND_DOWN);
    }

    public void setPeopleCnt(BigDecimal peopleCnt) {

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysVipInfoServiceImpl.java

@@ -549,7 +549,7 @@
    private void batchInsertLabel(List<String> labelList, Long id) {
        Set<String> labels = new HashSet<>(labelList);
        Iterator<String> iterator = labels.iterator();
        if (iterator.hasNext()) {
        while (iterator.hasNext()) {
            SysVipLabelRelate relate = new SysVipLabelRelate();
            relate.setLabelId(Long.parseLong(iterator.next()));
            relate.setVipId(id);

 zq-erp/src/main/resources/config/test/application.properties

@@ -4,10 +4,13 @@

#线上测试环境

spring.datasource.username=ct_test
spring.datasource.password=123456
spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8
#spring.datasource.username=ct_test
#spring.datasource.password=123456
#spring.datasource.url=jdbc:mysql://120.27.238.55:3306/hive_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8

spring.datasource.username=chuhuan
spring.datasource.password=chuhuan
spring.datasource.url=jdbc:mysql://175.6.132.141:3306/hive_v2_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=CONVERT_TO_NULL&allowMultiQueries=true&transformedBitIsBoolean=true&serverTimezone=GMT%2B8




 zq-erp/src/test/java/com/matrix/SourceFlowTests.java

@@ -2,14 +2,10 @@

import com.matrix.core.tools.StringUtils;
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.SysSourceFlow;
import com.matrix.system.hive.bean.SysVipInfo;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.ShoppingGoodsDao;
import com.matrix.system.hive.dao.SysSourceFlowDao;
import com.matrix.system.hive.dao.SysVipInfoDao;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.service.CodeService;
import com.matrix.system.hive.service.SysOrderService;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +15,7 @@
import org.springframework.transaction.annotation.Transactional;

import javax.sql.DataSource;
import java.math.BigDecimal;
import java.util.List;

/**
@@ -29,7 +26,7 @@
 * @date 2019年2月25日
 */
@RunWith(SpringRunner.class)
@SpringBootTest
@SpringBootTest(classes = {ZqErpApplication.class},webEnvironment =SpringBootTest.WebEnvironment.RANDOM_PORT)
public class SourceFlowTests {

    @Autowired
@@ -102,5 +99,76 @@

    }

    @Autowired
    private SysOrderDao sysOrderDao;

    @Autowired
    private CodeService codeService;

    @Autowired
    private SysOrderItemDao sysOrderItemDao;

    @Autowired
    private SysOrderFlowDao sysOrderFlowDao;

    /**
     * sysOrderFlowDao.xml insert语句需将createTime和updateTime修改
     * SysOrderDao.xml insert语句需将update语句中cashPay加上 or cashPay == 0
     *
     */
    @Test
    public void orderTransfer() {
        SysOrder query = new SysOrder();
        query.setStatu("已付款");
        List<SysOrder> sysOrders = sysOrderDao.selectByModel(query);

        for (SysOrder sysOrder : sysOrders) {
            sysOrder.setCashPay(sysOrder.getZkTotal());
            sysOrder.setCardPay(0);
            sysOrderDao.update(sysOrder);

            List<SysOrderItem> items = sysOrderItemDao.selectByOrderId(sysOrder.getId());

            SysOrderFlow flow = new SysOrderFlow();
            flow.setFlowNo("F" + sysOrder.getOrderNo().substring(1) + "-" + 1);
            if (items.size() <= 0) {
                continue;
            }
            Long goodsId = items.get(0).getGoodsId();
            ShoppingGoods goods = shoppingGoodsDao.selectById(goodsId);

            int j = 1;
            boolean flag = false;
            while (goods == null) {
                if (items.size() <= 1) {
                    flag = true;
                    break;
                }
                goodsId = items.get(j).getGoodsId();
                goods = shoppingGoodsDao.selectById(goodsId);
                j++;
                if (j + 1 >= items.size()) {
                    flag = true;
                    break;
                }
            }

            if (flag) {
                continue;
            }

            flow.setFlowContent(goods.getName().trim() + "等" + items.size() + "件产品");
            flow.setOrderId(sysOrder.getId());
            flow.setAmount(BigDecimal.valueOf(sysOrder.getZkTotal()));
            flow.setVipId(sysOrder.getVipId());
            flow.setFlowType(SysOrderFlow.FLOW_TYPE_BUY);
            flow.setPayMethod("现金");
            flow.setShopId(sysOrder.getShopId());
            flow.setCreateTime(sysOrder.getOrderTime());
            flow.setUpdateTime(sysOrder.getOrderTime());
            flow.setCompanyId(sysOrder.getCompanyId());
            sysOrderFlowDao.insert(flow);
        }
    }

}