Merge remote-tracking branch 'remotes/origin/peng' into test

AdminController/ServeManagementController.py

@@ -82,6 +82,8 @@ class serveManagement(View):
                 return self.createCdk(request_dict, response)
             elif operation == 'getVodStoreMeal':
                 return self.getVodStoreMeal(response)
+            elif operation == 'editExpress':
+                return self.editExpress(request_dict, response)
             elif operation == 'deleteCdk':
                 return self.deleteCdk(request_dict, response)
             elif operation == 'downloadCDK':
@@ -575,6 +577,17 @@ class serveManagement(View):
             print(e)
             return response.json(500, repr(e))
 
+    def editExpress(self, request_dict, response):
+        order_id = request_dict.get('orderID', None)
+        express_id = request_dict.get('express_id', None)
+        if not all([order_id, express_id]):
+            return response.json(444, {'error param': 'orderID or express_id'})
+        try:
+            CDKcontextModel.objects.filter(order=order_id).update(express_id=express_id)
+            return response.json(0)
+        except Exception as e:
+            return response.json(500, repr(e))
+
     def getVodStoreMeal(self, response):
         try:
             store_meal = Store_Meal.objects.filter(Q(is_show=0), ~Q(commodity_code='paypal_cycle'),