modify

Helius

2020-12-24 2e773eadb5876015e80c9e4c88502f4a28530643

modify

 zq-erp/src/main/java/com/matrix/system/app/action/ApiServiceOrderAction.java

@@ -1,6 +1,9 @@
package com.matrix.system.app.action;

import com.matrix.core.pojo.AjaxResult;
import io.swagger.annotations.Api;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@@ -12,4 +15,10 @@
@RestController
@RequestMapping(value = "/api/serviceOrder")
public class ApiServiceOrderAction {

    @GetMapping(value = "/findVipProject/{vipId}")
    public AjaxResult findVipProject(@PathVariable("vipId") Long vipId) {
        return null;
    }

}

 zq-erp/src/main/resources/mybatis/mapper/hive/SysOrderDao.xml

@@ -540,7 +540,7 @@
               a.cash_Pay cashPay,
               a.card_Pay cardPay,
               a.ZK_TOTAL needPay,
               a.card_Pay + a.card_Pay realPay,
               a.cash_Pay + a.card_Pay realPay,
               a.arrears arrears,
               a.TOTAL - a.ZK_TOTAL discount,
               a.STATU orderStatus,