Merge branch 'dev' into 'mp-server-test'

优化

See merge request quanshu/mp-server!581

mp-admin/src/main/java/com/qs/mp/web/controller/api/user/UserDeliverOrderController.java

@@ -211,6 +211,11 @@ public class UserDeliverOrderController extends BaseApiController {
         prizeStorage.setPicUrl(goodsSku.getPicUrl());
         prizeStorage.setSkuId(goodsSku.getSkuId());
         prizeStorage.setProperties(goodsSku.getProperties());
+
+        orderAmt = goodsNum * goodsSku.getValue();
+      }else {
+        orderAmt = goodsNum * goods.getValue();
+
       }
 
       prizeStorageList.add(prizeStorage);