fix

virgo.api/src/main/java/com/bosshand/virgo/api/workark/controller/OrderInfoController.java

@@ -67,6 +67,20 @@ public class OrderInfoController {
         return Response.ok(orderInfoService.calculateDetails(productId, productCouponList));
     }
 
+    @ApiOperation("修改价格")
+    @RequestMapping(value = "/price", method = RequestMethod.POST)
+    public Response updatePrice(@RequestBody OrderInfo orderInfo) {
+        orderInfoService.updatePrice(orderInfo);
+        return Response.ok();
+    }
+
+    @ApiOperation("修改状态")
+    @RequestMapping(value = "/status", method = RequestMethod.POST)
+    public Response updateStatus(@RequestBody OrderInfo orderInfo) {
+        orderInfoService.updateStatus(orderInfo);
+        return Response.ok();
+    }
+
     @ApiOperation("查询")
     @RequestMapping(value = "", method = RequestMethod.POST)
     public Response getList(@RequestBody OrderInfo orderInfo) {

virgo.api/src/main/java/com/bosshand/virgo/api/workark/controller/ProceModelController.java

@@ -30,7 +30,7 @@ public class ProceModelController {
     }
 
     @ApiOperation(value = "获取列表", notes = "获取列表")
-    @RequestMapping(value = "/list/{productCouponModelId}", method = RequestMethod.GET)
+    @RequestMapping(value = "/list/{productLevelId}", method = RequestMethod.GET)
     public Response getList(@PathVariable long productLevelId) {
         return Response.ok(proceModelService.getRoot(productLevelId));
     }

virgo.api/src/main/java/com/bosshand/virgo/api/workark/dao/OrderInfoDao.java

@@ -17,6 +17,10 @@ public interface OrderInfoDao {
 
     void updateContract(OrderInfo orderInfo);
 
+    void updateTotalFee(OrderInfo orderInfo);
+
+    void updateStatus(OrderInfo orderInfo);
+
     List<OrderInfo> getList(OrderInfo orderInfo);
 
     int getTotalCount(OrderInfo orderInfo);

virgo.api/src/main/java/com/bosshand/virgo/api/workark/model/OrderInfo.java

@@ -60,10 +60,15 @@ public class OrderInfo {
     private String codeUrl;
 
     /**
-     * 订单状态
+     * 订单支付状态
      */
     private String orderStatus;
 
+    /**
+     * 订单状态
+     */
+    private int status;
+
     /**
      * 优惠券ids
      */
@@ -177,6 +182,14 @@ public class OrderInfo {
         this.orderStatus = orderStatus;
     }
 
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
     public String getProductCouponIds() {
         return productCouponIds;
     }

virgo.api/src/main/java/com/bosshand/virgo/api/workark/service/OrderInfoService.java

@@ -291,6 +291,22 @@ public class OrderInfoService {
         return new BigDecimal(0);
     }
 
+    /**
+     * 修改价格
+     */
+    public void updatePrice(OrderInfo orderInfo) {
+        OrderInfo info = orderInfoDao.getOrderNo(orderInfo.getOrderNo());
+        info.setTotalFee(orderInfo.getTotalFee());
+        orderInfoDao.updateTotalFee(info);
+    }
 
+    /**
+     * 修改状态
+     */
+    public void updateStatus(OrderInfo orderInfo) {
+        OrderInfo info = orderInfoDao.getOrderNo(orderInfo.getOrderNo());
+        info.setStatus(orderInfo.getStatus());
+        orderInfoDao.updateStatus(info);
+    }
 
 }

virgo.api/src/main/resources/mapper/OrderInfoMapper.xml

@@ -15,6 +15,7 @@
         <result column="totalFee" property="totalFee"/>
         <result column="codeUrl" property="codeUrl"/>
         <result column="orderStatus" property="orderStatus"/>
+        <result column="status" property="status"/>
         <result column="paymentType" property="paymentType"/>
         <result column="productCouponIds" property="productCouponIds"/>
         <result column="contract" property="contract"/>
@@ -57,6 +58,7 @@
             <if test="orderStatus != null">
                 and orderStatus = #{orderStatus}
             </if>
+                and status = #{status}
             <if test="paymentType != null">
                 and paymentType = #{paymentType}
             </if>
@@ -90,6 +92,7 @@
             <if test="orderStatus != null">
                 and orderStatus = #{orderStatus}
             </if>
+                and status = #{status}
             <if test="paymentType != null">
                 and paymentType = #{paymentType}
             </if>
@@ -123,6 +126,7 @@
             <if test="p.orderStatus != null">
                 and orderStatus = #{p.orderStatus}
             </if>
+                and status = #{p.status}
             <if test="p.paymentType != null">
                 and paymentType = #{p.paymentType}
             </if>
@@ -160,6 +164,14 @@
         UPDATE workark_orderInfo SET contract = #{contract} WHERE id = #{id}
     </update>
 
+    <update id="updateTotalFee" parameterType="com.bosshand.virgo.api.workark.model.OrderInfo">
+        UPDATE workark_orderInfo SET totalFee=#{totalFee} WHERE id=#{id}
+    </update>
+
+    <update id="updateStatus" parameterType="com.bosshand.virgo.api.workark.model.OrderInfo">
+        UPDATE workark_orderInfo SET status = #{status} WHERE id = #{id}
+    </update>
+
     <delete id="delete">
         DELETE FROM workark_orderInfo WHERE id = #{id}
     </delete>