修改数据库

935090232@qq.com

2021-03-05 b4da2725da57633daff22eed89f09d6e33f18560

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

@@ -15,13 +15,9 @@
import com.matrix.system.common.tools.ResponseHeadUtil;
import com.matrix.system.constance.Dictionary;
import com.matrix.system.constance.SystemConstance;
import com.matrix.system.hive.action.util.QueryUtil;
import com.matrix.system.hive.bean.*;
import com.matrix.system.hive.dao.MoneyCardUseDao;
import com.matrix.system.hive.dao.SysOrderDao;
import com.matrix.system.hive.dao.SysOrderItemDao;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.core.tools.DateUtil;
import com.matrix.system.hive.dao.*;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.pojo.ShoppingCarItem;
import com.matrix.system.hive.pojo.ShoppingCarItemsVo;
import com.matrix.system.hive.service.*;
@@ -60,6 +56,11 @@
public class OrderController extends BaseController {
    @Resource
    private SysOrderService orderService;
    @Autowired
    ShoppingGoodsDao shoppingGoodsDao;

    @Autowired
    private CodeService codeService;

    @Autowired
    private SysOrderItemDao orderItemDao;
@@ -87,6 +88,9 @@

    @Autowired
    private SysOrderFlowService sysOrderFlowService;

    @Autowired
    private SysOrderFlowDao sysOrderFlowDao;

    @Autowired
    RabiitMqTemplate rabiitMqTemplate;
@@ -126,6 +130,7 @@
    AjaxResult payOrder(@RequestBody SysOrder sysOrder) {
        SysUsers user = getMe();
        sysOrder.setShopId(user.getShopId());
        sysOrder.setOrderType(SysOrder.ORDER_TYPE_SEAL);
        //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
        sysOrder = orderService.checkAndSaveOrder(sysOrder);
        orderService.updateReceiptMoney(sysOrder);
@@ -151,12 +156,39 @@
    @ResponseBody
    @Transactional(rollbackFor = Exception.class)
    public AjaxResult refundOrder(@RequestBody SysOrder sysOrder) {
        //储值卡订单不能通过退款渠道退款
        if(CollectionUtils.isNotEmpty(sysOrder.getItems())){
            List<SysOrderItem> orderItem = orderItemService.findByOrderId(sysOrder.getItems().get(0).getOrderId());
            if(orderItem.size()==1){
                if(orderItem.get(0).getShoppingGoods().getCode().equals("vipCzk")){
                    return AjaxResult.buildFailInstance("充值订单请直接冲负数金额退款！");
                }
            }
        }
        SysUsers user = getMe();
        sysOrder.setStaffId(user.getSuId());
        sysOrder.setCompanyId(user.getCompanyId());
        sysOrder.setShopId(user.getShopId());
        sysOrder.setStatu(Dictionary.ORDER_STATU_TK);
        sysOrder.setOrderTime(new Date());
        //校验订单是否满足结算调价，新订单则保存订单，已有订单则删除后更新
        sysOrder = orderService.checkAndSaveOrder(sysOrder);
        sysOrder.setOrderNo(codeService.getRefundOrderNo());
        //新增订单
        sysOrderDao.insert(sysOrder);
        //插入明细
        for (SysOrderItem item : sysOrder.getItems()) {
            SysOrderItem oldItem=orderItemDao.selectById(item.getId());
            item.setType(oldItem.getType());
            // 取负数
            item.setStatus(Dictionary.ORDER_STATU_TK);
            item.setCount(-item.getCount());
            item.setOrderId(sysOrder.getId());
            item.setId(null);
            orderItemDao.insert(item);
        }




        orderService.refundOrderMoney(sysOrder);
        //处理用户购买的产品
        return AjaxResult.buildSuccessInstance(Arrays.asList(sysOrder), "订单退款成功");
@@ -270,13 +302,17 @@
    public @ResponseBody
    AjaxResult updateOrderTime(SysOrder sysOrder) {

        sysOrderDao.updateOrderTime(sysOrder.getOrderTime(), sysOrder.getId());
        sysOrderDao.updateOrderTime(sysOrder.getPayTime(), sysOrder.getId());
        // 修改业绩时间
        // 更新业绩时间
        AchieveNew achieveNew = new AchieveNew();
        achieveNew.setOrderId(sysOrder.getId());
        achieveNew.setDatatime(sysOrder.getOrderTime());
        achieveNew.setDatatime(sysOrder.getPayTime());
        achieveNewService.modifyAchieveTime(achieveNew);
        //更新收款流水时间
        sysOrderFlowDao.updateTimeByOrderId(sysOrder.getId(),sysOrder.getPayTime());


        return new AjaxResult(AjaxResult.STATUS_SUCCESS, "修改成功");
    }

@@ -293,16 +329,7 @@
        MoneyCardUse cardUseInfo = cardUseService.findByVipId(order.getVipId());

        if (cardUseInfo == null) {
            cardUseInfo = new MoneyCardUse();
            cardUseInfo.setVipId(order.getVipId());
            cardUseInfo.setCardName("储值卡");
            cardUseInfo.setIsVipCar(Dictionary.FLAG_YES_Y);
            cardUseInfo.setRealMoney(0D);
            cardUseInfo.setGiftMoney(0D);
            cardUseInfo.setSource("-");
            cardUseInfo.setStatus(Dictionary.MONEYCARD_STATUS_YX);
            cardUseInfo.setFailTime(DateUtil.stringToDate("2050-01-01 00:00",DateUtil.DATE_FORMAT_MM));
            moneyCardUseDao.insert(cardUseInfo);
            cardUseInfo=sysVipInfoService.addVipDefaultCard(order.getVipId());
        }

        //打印需求加入门店信息